Merging upstream version 1.68.2+dfsg1.

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

44 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.fixed b/tests/ui/rust-2021/array-into-iter-ambiguous.fixed
index 76f661bae..76f661bae 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.fixed
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.fixed
diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.rs b/tests/ui/rust-2021/array-into-iter-ambiguous.rs
index 83fbf8f6c..83fbf8f6c 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.rs
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.rs
diff --git a/src/test/ui/rust-2021/array-into-iter-ambiguous.stderr b/tests/ui/rust-2021/array-into-iter-ambiguous.stderr
index 2a724bd30..2a724bd30 100644
--- a/src/test/ui/rust-2021/array-into-iter-ambiguous.stderr
+++ b/tests/ui/rust-2021/array-into-iter-ambiguous.stderr
diff --git a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
index eb301e5e1..eb301e5e1 100644
--- a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
diff --git a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
index 691bfdc15..691bfdc15 100644
--- a/src/test/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed b/tests/ui/rust-2021/future-prelude-collision-generic-trait.fixed
index a1b6f5b16..a1b6f5b16 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.rs b/tests/ui/rust-2021/future-prelude-collision-generic-trait.rs
index 142ba5520..142ba5520 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.stderr b/tests/ui/rust-2021/future-prelude-collision-generic-trait.stderr
index f38da132b..f38da132b 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-generic-trait.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.fixed b/tests/ui/rust-2021/future-prelude-collision-generic.fixed
index 1bb9ba377..1bb9ba377 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.rs b/tests/ui/rust-2021/future-prelude-collision-generic.rs
index d7f8affc6..d7f8affc6 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr b/tests/ui/rust-2021/future-prelude-collision-generic.stderr
index 9893b3eba..9893b3eba 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-generic.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.fixed b/tests/ui/rust-2021/future-prelude-collision-imported.fixed
index 15ccff749..15ccff749 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.rs b/tests/ui/rust-2021/future-prelude-collision-imported.rs
index cdffcaf75..cdffcaf75 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-imported.stderr b/tests/ui/rust-2021/future-prelude-collision-imported.stderr
index c1d72d0df..c1d72d0df 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-imported.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-imported.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.fixed b/tests/ui/rust-2021/future-prelude-collision-macros.fixed
index a97dc176e..a97dc176e 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.rs b/tests/ui/rust-2021/future-prelude-collision-macros.rs
index 82484b5b3..82484b5b3 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-macros.stderr b/tests/ui/rust-2021/future-prelude-collision-macros.stderr
index 4d4a07699..4d4a07699 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-macros.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-macros.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs b/tests/ui/rust-2021/future-prelude-collision-shadow.rs
index 27891a8d1..27891a8d1 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-shadow.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr b/tests/ui/rust-2021/future-prelude-collision-shadow.stderr
index 3d21b735a..3d21b735a 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-shadow.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.fixed b/tests/ui/rust-2021/future-prelude-collision-turbofish.fixed
index 3e76fced7..3e76fced7 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.rs b/tests/ui/rust-2021/future-prelude-collision-turbofish.rs
index abb292ef9..abb292ef9 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision-turbofish.stderr b/tests/ui/rust-2021/future-prelude-collision-turbofish.stderr
index c0ef80fd8..c0ef80fd8 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-turbofish.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision-turbofish.stderr
diff --git a/src/test/ui/rust-2021/future-prelude-collision-unneeded.rs b/tests/ui/rust-2021/future-prelude-collision-unneeded.rs
index 247d5884b..247d5884b 100644
--- a/src/test/ui/rust-2021/future-prelude-collision-unneeded.rs
+++ b/tests/ui/rust-2021/future-prelude-collision-unneeded.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision.fixed b/tests/ui/rust-2021/future-prelude-collision.fixed
index 43b0ec1c3..43b0ec1c3 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.fixed
+++ b/tests/ui/rust-2021/future-prelude-collision.fixed
diff --git a/src/test/ui/rust-2021/future-prelude-collision.rs b/tests/ui/rust-2021/future-prelude-collision.rs
index 4c7a47ffb..4c7a47ffb 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.rs
+++ b/tests/ui/rust-2021/future-prelude-collision.rs
diff --git a/src/test/ui/rust-2021/future-prelude-collision.stderr b/tests/ui/rust-2021/future-prelude-collision.stderr
index cae113ff7..cae113ff7 100644
--- a/src/test/ui/rust-2021/future-prelude-collision.stderr
+++ b/tests/ui/rust-2021/future-prelude-collision.stderr
diff --git a/src/test/ui/rust-2021/generic-type-collision.fixed b/tests/ui/rust-2021/generic-type-collision.fixed
index feba7d19b..feba7d19b 100644
--- a/src/test/ui/rust-2021/generic-type-collision.fixed
+++ b/tests/ui/rust-2021/generic-type-collision.fixed
diff --git a/src/test/ui/rust-2021/generic-type-collision.rs b/tests/ui/rust-2021/generic-type-collision.rs
index 335e7e520..335e7e520 100644
--- a/src/test/ui/rust-2021/generic-type-collision.rs
+++ b/tests/ui/rust-2021/generic-type-collision.rs
diff --git a/src/test/ui/rust-2021/generic-type-collision.stderr b/tests/ui/rust-2021/generic-type-collision.stderr
index 1ec61044f..1ec61044f 100644
--- a/src/test/ui/rust-2021/generic-type-collision.stderr
+++ b/tests/ui/rust-2021/generic-type-collision.stderr
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.fixed b/tests/ui/rust-2021/inherent-dyn-collision.fixed
index 5789a9039..5789a9039 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.fixed
+++ b/tests/ui/rust-2021/inherent-dyn-collision.fixed
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.rs b/tests/ui/rust-2021/inherent-dyn-collision.rs
index a3893c033..a3893c033 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.rs
+++ b/tests/ui/rust-2021/inherent-dyn-collision.rs
diff --git a/src/test/ui/rust-2021/inherent-dyn-collision.stderr b/tests/ui/rust-2021/inherent-dyn-collision.stderr
index f5905574a..f5905574a 100644
--- a/src/test/ui/rust-2021/inherent-dyn-collision.stderr
+++ b/tests/ui/rust-2021/inherent-dyn-collision.stderr
diff --git a/src/test/ui/rust-2021/inherent-method-collision.rs b/tests/ui/rust-2021/inherent-method-collision.rs
index 507105207..507105207 100644
--- a/src/test/ui/rust-2021/inherent-method-collision.rs
+++ b/tests/ui/rust-2021/inherent-method-collision.rs
diff --git a/src/test/ui/rust-2021/panic.rs b/tests/ui/rust-2021/panic.rs
index 394fc3c8f..394fc3c8f 100644
--- a/src/test/ui/rust-2021/panic.rs
+++ b/tests/ui/rust-2021/panic.rs
diff --git a/src/test/ui/rust-2021/panic.stderr b/tests/ui/rust-2021/panic.stderr
index 40b62d279..40b62d279 100644
--- a/src/test/ui/rust-2021/panic.stderr
+++ b/tests/ui/rust-2021/panic.stderr
diff --git a/src/test/ui/rust-2021/prelude2021.rs b/tests/ui/rust-2021/prelude2021.rs
index a63b6fcf2..a63b6fcf2 100644
--- a/src/test/ui/rust-2021/prelude2021.rs
+++ b/tests/ui/rust-2021/prelude2021.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.fixed b/tests/ui/rust-2021/reserved-prefixes-migration.fixed
index eed2f313a..eed2f313a 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.fixed
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.fixed
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.rs b/tests/ui/rust-2021/reserved-prefixes-migration.rs
index 0565db793..0565db793 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.stderr b/tests/ui/rust-2021/reserved-prefixes-migration.stderr
index 20914d1b9..20914d1b9 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-migration.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes-migration.stderr
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
index 74f206606..74f206606 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.stderr b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
index ae7c5d60c..ae7c5d60c 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.stderr
diff --git a/src/test/ui/rust-2021/reserved-prefixes-via-macro.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
index 110b6d64c..110b6d64c 100644
--- a/src/test/ui/rust-2021/reserved-prefixes-via-macro.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes.rs b/tests/ui/rust-2021/reserved-prefixes.rs
index 1994f25b6..1994f25b6 100644
--- a/src/test/ui/rust-2021/reserved-prefixes.rs
+++ b/tests/ui/rust-2021/reserved-prefixes.rs
diff --git a/src/test/ui/rust-2021/reserved-prefixes.stderr b/tests/ui/rust-2021/reserved-prefixes.stderr
index 807d6d98b..807d6d98b 100644
--- a/src/test/ui/rust-2021/reserved-prefixes.stderr
+++ b/tests/ui/rust-2021/reserved-prefixes.stderr