Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

37 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/traits/inheritance/auto-xc-2.rs b/tests/ui/traits/inheritance/auto-xc-2.rs
index f2130228d..f2130228d 100644
--- a/src/test/ui/traits/inheritance/auto-xc-2.rs
+++ b/tests/ui/traits/inheritance/auto-xc-2.rs
diff --git a/src/test/ui/traits/inheritance/auto-xc.rs b/tests/ui/traits/inheritance/auto-xc.rs
index 3d5ae182a..3d5ae182a 100644
--- a/src/test/ui/traits/inheritance/auto-xc.rs
+++ b/tests/ui/traits/inheritance/auto-xc.rs
diff --git a/src/test/ui/traits/inheritance/auto.rs b/tests/ui/traits/inheritance/auto.rs
index 0be67a55e..0be67a55e 100644
--- a/src/test/ui/traits/inheritance/auto.rs
+++ b/tests/ui/traits/inheritance/auto.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/auto_xc.rs b/tests/ui/traits/inheritance/auxiliary/auto_xc.rs
index 9af26cb2e..9af26cb2e 100644
--- a/src/test/ui/traits/inheritance/auxiliary/auto_xc.rs
+++ b/tests/ui/traits/inheritance/auxiliary/auto_xc.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/auto_xc_2.rs b/tests/ui/traits/inheritance/auxiliary/auto_xc_2.rs
index e9327676d..e9327676d 100644
--- a/src/test/ui/traits/inheritance/auxiliary/auto_xc_2.rs
+++ b/tests/ui/traits/inheritance/auxiliary/auto_xc_2.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/overloading_xc.rs b/tests/ui/traits/inheritance/auxiliary/overloading_xc.rs
index a25704412..a25704412 100644
--- a/src/test/ui/traits/inheritance/auxiliary/overloading_xc.rs
+++ b/tests/ui/traits/inheritance/auxiliary/overloading_xc.rs
diff --git a/src/test/ui/traits/inheritance/auxiliary/xc_call.rs b/tests/ui/traits/inheritance/auxiliary/xc_call.rs
index b76c52e62..b76c52e62 100644
--- a/src/test/ui/traits/inheritance/auxiliary/xc_call.rs
+++ b/tests/ui/traits/inheritance/auxiliary/xc_call.rs
diff --git a/src/test/ui/traits/inheritance/basic.rs b/tests/ui/traits/inheritance/basic.rs
index 5bfa60b1a..5bfa60b1a 100644
--- a/src/test/ui/traits/inheritance/basic.rs
+++ b/tests/ui/traits/inheritance/basic.rs
diff --git a/src/test/ui/traits/inheritance/call-bound-inherited.rs b/tests/ui/traits/inheritance/call-bound-inherited.rs
index 37c2ff63c..37c2ff63c 100644
--- a/src/test/ui/traits/inheritance/call-bound-inherited.rs
+++ b/tests/ui/traits/inheritance/call-bound-inherited.rs
diff --git a/src/test/ui/traits/inheritance/call-bound-inherited2.rs b/tests/ui/traits/inheritance/call-bound-inherited2.rs
index 8576d29f2..8576d29f2 100644
--- a/src/test/ui/traits/inheritance/call-bound-inherited2.rs
+++ b/tests/ui/traits/inheritance/call-bound-inherited2.rs
diff --git a/src/test/ui/traits/inheritance/cast-without-call-to-supertrait.rs b/tests/ui/traits/inheritance/cast-without-call-to-supertrait.rs
index 25159c1ad..25159c1ad 100644
--- a/src/test/ui/traits/inheritance/cast-without-call-to-supertrait.rs
+++ b/tests/ui/traits/inheritance/cast-without-call-to-supertrait.rs
diff --git a/src/test/ui/traits/inheritance/cast.rs b/tests/ui/traits/inheritance/cast.rs
index 9070b9d1f..9070b9d1f 100644
--- a/src/test/ui/traits/inheritance/cast.rs
+++ b/tests/ui/traits/inheritance/cast.rs
diff --git a/src/test/ui/traits/inheritance/cross-trait-call-xc.rs b/tests/ui/traits/inheritance/cross-trait-call-xc.rs
index 99fbb5c61..99fbb5c61 100644
--- a/src/test/ui/traits/inheritance/cross-trait-call-xc.rs
+++ b/tests/ui/traits/inheritance/cross-trait-call-xc.rs
diff --git a/src/test/ui/traits/inheritance/cross-trait-call.rs b/tests/ui/traits/inheritance/cross-trait-call.rs
index 512c928ca..512c928ca 100644
--- a/src/test/ui/traits/inheritance/cross-trait-call.rs
+++ b/tests/ui/traits/inheritance/cross-trait-call.rs
diff --git a/src/test/ui/traits/inheritance/diamond.rs b/tests/ui/traits/inheritance/diamond.rs
index 32ad0fb4d..32ad0fb4d 100644
--- a/src/test/ui/traits/inheritance/diamond.rs
+++ b/tests/ui/traits/inheritance/diamond.rs
diff --git a/src/test/ui/traits/inheritance/multiple-inheritors.rs b/tests/ui/traits/inheritance/multiple-inheritors.rs
index 77ecbd8eb..77ecbd8eb 100644
--- a/src/test/ui/traits/inheritance/multiple-inheritors.rs
+++ b/tests/ui/traits/inheritance/multiple-inheritors.rs
diff --git a/src/test/ui/traits/inheritance/multiple-params.rs b/tests/ui/traits/inheritance/multiple-params.rs
index 8ff5ba541..8ff5ba541 100644
--- a/src/test/ui/traits/inheritance/multiple-params.rs
+++ b/tests/ui/traits/inheritance/multiple-params.rs
diff --git a/src/test/ui/traits/inheritance/num.rs b/tests/ui/traits/inheritance/num.rs
index 3d63d78ca..3d63d78ca 100644
--- a/src/test/ui/traits/inheritance/num.rs
+++ b/tests/ui/traits/inheritance/num.rs
diff --git a/src/test/ui/traits/inheritance/num0.rs b/tests/ui/traits/inheritance/num0.rs
index cee52542d..cee52542d 100644
--- a/src/test/ui/traits/inheritance/num0.rs
+++ b/tests/ui/traits/inheritance/num0.rs
diff --git a/src/test/ui/traits/inheritance/num1.rs b/tests/ui/traits/inheritance/num1.rs
index 663dd3a5e..663dd3a5e 100644
--- a/src/test/ui/traits/inheritance/num1.rs
+++ b/tests/ui/traits/inheritance/num1.rs
diff --git a/src/test/ui/traits/inheritance/num2.rs b/tests/ui/traits/inheritance/num2.rs
index b713c66a3..b713c66a3 100644
--- a/src/test/ui/traits/inheritance/num2.rs
+++ b/tests/ui/traits/inheritance/num2.rs
diff --git a/src/test/ui/traits/inheritance/num3.rs b/tests/ui/traits/inheritance/num3.rs
index c40be6f83..c40be6f83 100644
--- a/src/test/ui/traits/inheritance/num3.rs
+++ b/tests/ui/traits/inheritance/num3.rs
diff --git a/src/test/ui/traits/inheritance/num5.rs b/tests/ui/traits/inheritance/num5.rs
index f478618f7..f478618f7 100644
--- a/src/test/ui/traits/inheritance/num5.rs
+++ b/tests/ui/traits/inheritance/num5.rs
diff --git a/src/test/ui/traits/inheritance/overloading-simple.rs b/tests/ui/traits/inheritance/overloading-simple.rs
index c306aa2cd..c306aa2cd 100644
--- a/src/test/ui/traits/inheritance/overloading-simple.rs
+++ b/tests/ui/traits/inheritance/overloading-simple.rs
diff --git a/src/test/ui/traits/inheritance/overloading-xc-exe.rs b/tests/ui/traits/inheritance/overloading-xc-exe.rs
index 08778061b..08778061b 100644
--- a/src/test/ui/traits/inheritance/overloading-xc-exe.rs
+++ b/tests/ui/traits/inheritance/overloading-xc-exe.rs
diff --git a/src/test/ui/traits/inheritance/overloading.rs b/tests/ui/traits/inheritance/overloading.rs
index 083643e82..083643e82 100644
--- a/src/test/ui/traits/inheritance/overloading.rs
+++ b/tests/ui/traits/inheritance/overloading.rs
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.rs b/tests/ui/traits/inheritance/repeated-supertrait-ambig.rs
index 727897d20..727897d20 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.rs
+++ b/tests/ui/traits/inheritance/repeated-supertrait-ambig.rs
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr b/tests/ui/traits/inheritance/repeated-supertrait-ambig.stderr
index 656e0d0bf..656e0d0bf 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr
+++ b/tests/ui/traits/inheritance/repeated-supertrait-ambig.stderr
diff --git a/src/test/ui/traits/inheritance/repeated-supertrait.rs b/tests/ui/traits/inheritance/repeated-supertrait.rs
index cb2581ffa..cb2581ffa 100644
--- a/src/test/ui/traits/inheritance/repeated-supertrait.rs
+++ b/tests/ui/traits/inheritance/repeated-supertrait.rs
diff --git a/src/test/ui/traits/inheritance/self-in-supertype.rs b/tests/ui/traits/inheritance/self-in-supertype.rs
index e8a2bd791..e8a2bd791 100644
--- a/src/test/ui/traits/inheritance/self-in-supertype.rs
+++ b/tests/ui/traits/inheritance/self-in-supertype.rs
diff --git a/src/test/ui/traits/inheritance/self.rs b/tests/ui/traits/inheritance/self.rs
index 5f2559f48..5f2559f48 100644
--- a/src/test/ui/traits/inheritance/self.rs
+++ b/tests/ui/traits/inheritance/self.rs
diff --git a/src/test/ui/traits/inheritance/simple.rs b/tests/ui/traits/inheritance/simple.rs
index ca3a284e5..ca3a284e5 100644
--- a/src/test/ui/traits/inheritance/simple.rs
+++ b/tests/ui/traits/inheritance/simple.rs
diff --git a/src/test/ui/traits/inheritance/static.rs b/tests/ui/traits/inheritance/static.rs
index 16218fbd2..16218fbd2 100644
--- a/src/test/ui/traits/inheritance/static.rs
+++ b/tests/ui/traits/inheritance/static.rs
diff --git a/src/test/ui/traits/inheritance/static2.rs b/tests/ui/traits/inheritance/static2.rs
index bc78e1e23..bc78e1e23 100644
--- a/src/test/ui/traits/inheritance/static2.rs
+++ b/tests/ui/traits/inheritance/static2.rs
diff --git a/src/test/ui/traits/inheritance/subst.rs b/tests/ui/traits/inheritance/subst.rs
index b2b650366..b2b650366 100644
--- a/src/test/ui/traits/inheritance/subst.rs
+++ b/tests/ui/traits/inheritance/subst.rs
diff --git a/src/test/ui/traits/inheritance/subst2.rs b/tests/ui/traits/inheritance/subst2.rs
index ccc9628c7..ccc9628c7 100644
--- a/src/test/ui/traits/inheritance/subst2.rs
+++ b/tests/ui/traits/inheritance/subst2.rs
diff --git a/src/test/ui/traits/inheritance/visibility.rs b/tests/ui/traits/inheritance/visibility.rs
index 6ad864926..6ad864926 100644
--- a/src/test/ui/traits/inheritance/visibility.rs
+++ b/tests/ui/traits/inheritance/visibility.rs