Merging upstream version 1.68.2+dfsg1.

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

45 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/editions/async-block-2015.rs b/tests/ui/editions/async-block-2015.rs
index 3daf4930c..3daf4930c 100644
--- a/src/test/ui/editions/async-block-2015.rs
+++ b/tests/ui/editions/async-block-2015.rs
diff --git a/src/test/ui/editions/async-block-2015.stderr b/tests/ui/editions/async-block-2015.stderr
index b792b8c1e..b792b8c1e 100644
--- a/src/test/ui/editions/async-block-2015.stderr
+++ b/tests/ui/editions/async-block-2015.stderr
diff --git a/src/test/ui/editions/auxiliary/absolute.rs b/tests/ui/editions/auxiliary/absolute.rs
index d596f9735..d596f9735 100644
--- a/src/test/ui/editions/auxiliary/absolute.rs
+++ b/tests/ui/editions/auxiliary/absolute.rs
diff --git a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs b/tests/ui/editions/auxiliary/edition-extern-crate-allowed.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs
+++ b/tests/ui/editions/auxiliary/edition-extern-crate-allowed.rs
diff --git a/src/test/ui/editions/auxiliary/edition-imports-2015.rs b/tests/ui/editions/auxiliary/edition-imports-2015.rs
index c72331ca2..c72331ca2 100644
--- a/src/test/ui/editions/auxiliary/edition-imports-2015.rs
+++ b/tests/ui/editions/auxiliary/edition-imports-2015.rs
diff --git a/src/test/ui/editions/auxiliary/edition-imports-2018.rs b/tests/ui/editions/auxiliary/edition-imports-2018.rs
index b08dc499a..b08dc499a 100644
--- a/src/test/ui/editions/auxiliary/edition-imports-2018.rs
+++ b/tests/ui/editions/auxiliary/edition-imports-2018.rs
diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs b/tests/ui/editions/auxiliary/edition-kw-macro-2015.rs
index 7cfd128f2..7cfd128f2 100644
--- a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs
+++ b/tests/ui/editions/auxiliary/edition-kw-macro-2015.rs
diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs b/tests/ui/editions/auxiliary/edition-kw-macro-2018.rs
index d07c0218d..d07c0218d 100644
--- a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs
+++ b/tests/ui/editions/auxiliary/edition-kw-macro-2018.rs
diff --git a/src/test/ui/editions/dyn-trait-sugg-2021.rs b/tests/ui/editions/dyn-trait-sugg-2021.rs
index de0444b63..de0444b63 100644
--- a/src/test/ui/editions/dyn-trait-sugg-2021.rs
+++ b/tests/ui/editions/dyn-trait-sugg-2021.rs
diff --git a/src/test/ui/editions/dyn-trait-sugg-2021.stderr b/tests/ui/editions/dyn-trait-sugg-2021.stderr
index 8c68dec1d..8c68dec1d 100644
--- a/src/test/ui/editions/dyn-trait-sugg-2021.stderr
+++ b/tests/ui/editions/dyn-trait-sugg-2021.stderr
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.rs b/tests/ui/editions/edition-extern-crate-allowed.rs
index 8d142cea5..8d142cea5 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.rs
+++ b/tests/ui/editions/edition-extern-crate-allowed.rs
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.stderr b/tests/ui/editions/edition-extern-crate-allowed.stderr
index dde774c52..dde774c52 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.stderr
+++ b/tests/ui/editions/edition-extern-crate-allowed.stderr
diff --git a/src/test/ui/editions/edition-feature-ok.rs b/tests/ui/editions/edition-feature-ok.rs
index 69242fd71..69242fd71 100644
--- a/src/test/ui/editions/edition-feature-ok.rs
+++ b/tests/ui/editions/edition-feature-ok.rs
diff --git a/src/test/ui/editions/edition-feature-redundant.rs b/tests/ui/editions/edition-feature-redundant.rs
index 1049a2da8..1049a2da8 100644
--- a/src/test/ui/editions/edition-feature-redundant.rs
+++ b/tests/ui/editions/edition-feature-redundant.rs
diff --git a/src/test/ui/editions/edition-feature-redundant.stderr b/tests/ui/editions/edition-feature-redundant.stderr
index b11e616d7..b11e616d7 100644
--- a/src/test/ui/editions/edition-feature-redundant.stderr
+++ b/tests/ui/editions/edition-feature-redundant.stderr
diff --git a/src/test/ui/editions/edition-imports-2015.rs b/tests/ui/editions/edition-imports-2015.rs
index 5ba45b19d..5ba45b19d 100644
--- a/src/test/ui/editions/edition-imports-2015.rs
+++ b/tests/ui/editions/edition-imports-2015.rs
diff --git a/src/test/ui/editions/edition-imports-2015.stderr b/tests/ui/editions/edition-imports-2015.stderr
index 3f38e6f8e..3f38e6f8e 100644
--- a/src/test/ui/editions/edition-imports-2015.stderr
+++ b/tests/ui/editions/edition-imports-2015.stderr
diff --git a/src/test/ui/editions/edition-imports-2018.rs b/tests/ui/editions/edition-imports-2018.rs
index dcdbf0d05..dcdbf0d05 100644
--- a/src/test/ui/editions/edition-imports-2018.rs
+++ b/tests/ui/editions/edition-imports-2018.rs
diff --git a/src/test/ui/editions/edition-imports-2018.stderr b/tests/ui/editions/edition-imports-2018.stderr
index e7f760e49..e7f760e49 100644
--- a/src/test/ui/editions/edition-imports-2018.stderr
+++ b/tests/ui/editions/edition-imports-2018.stderr
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-ambiguity.rs b/tests/ui/editions/edition-imports-virtual-2015-ambiguity.rs
index 3fffb30c6..3fffb30c6 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-ambiguity.rs
+++ b/tests/ui/editions/edition-imports-virtual-2015-ambiguity.rs
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-gated.rs b/tests/ui/editions/edition-imports-virtual-2015-gated.rs
index 634d3e9a4..634d3e9a4 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-gated.rs
+++ b/tests/ui/editions/edition-imports-virtual-2015-gated.rs
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr b/tests/ui/editions/edition-imports-virtual-2015-gated.stderr
index e4bdd2821..e4bdd2821 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
+++ b/tests/ui/editions/edition-imports-virtual-2015-gated.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs b/tests/ui/editions/edition-keywords-2015-2015-expansion.rs
index b2695bea5..b2695bea5 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs b/tests/ui/editions/edition-keywords-2015-2015-parsing.rs
index d1752a7ec..d1752a7ec 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr b/tests/ui/editions/edition-keywords-2015-2015-parsing.stderr
index 39944622d..39944622d 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2015-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2015.rs b/tests/ui/editions/edition-keywords-2015-2015.rs
index 943d203b8..943d203b8 100644
--- a/src/test/ui/editions/edition-keywords-2015-2015.rs
+++ b/tests/ui/editions/edition-keywords-2015-2015.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs b/tests/ui/editions/edition-keywords-2015-2018-expansion.rs
index 9f34a3887..9f34a3887 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr b/tests/ui/editions/edition-keywords-2015-2018-expansion.stderr
index 570bbac2b..570bbac2b 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2018-expansion.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs b/tests/ui/editions/edition-keywords-2015-2018-parsing.rs
index 44455f438..44455f438 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr b/tests/ui/editions/edition-keywords-2015-2018-parsing.stderr
index fa83908e6..fa83908e6 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2015-2018-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2015-2018.rs b/tests/ui/editions/edition-keywords-2015-2018.rs
index 8c3397c95..8c3397c95 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018.rs
+++ b/tests/ui/editions/edition-keywords-2015-2018.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs b/tests/ui/editions/edition-keywords-2018-2015-expansion.rs
index 707d8e95c..707d8e95c 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs b/tests/ui/editions/edition-keywords-2018-2015-parsing.rs
index d5ed9fb9a..d5ed9fb9a 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/tests/ui/editions/edition-keywords-2018-2015-parsing.stderr
index 1a4a94e97..1a4a94e97 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2015-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2015.rs b/tests/ui/editions/edition-keywords-2018-2015.rs
index 2cb2dfb18..2cb2dfb18 100644
--- a/src/test/ui/editions/edition-keywords-2018-2015.rs
+++ b/tests/ui/editions/edition-keywords-2018-2015.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs b/tests/ui/editions/edition-keywords-2018-2018-expansion.rs
index a8e69fed6..a8e69fed6 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018-expansion.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr b/tests/ui/editions/edition-keywords-2018-2018-expansion.stderr
index 69f275746..69f275746 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2018-expansion.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs b/tests/ui/editions/edition-keywords-2018-2018-parsing.rs
index 044ab249f..044ab249f 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018-parsing.rs
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/tests/ui/editions/edition-keywords-2018-2018-parsing.stderr
index 19eb7ac98..19eb7ac98 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr
+++ b/tests/ui/editions/edition-keywords-2018-2018-parsing.stderr
diff --git a/src/test/ui/editions/edition-keywords-2018-2018.rs b/tests/ui/editions/edition-keywords-2018-2018.rs
index 5043440aa..5043440aa 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018.rs
+++ b/tests/ui/editions/edition-keywords-2018-2018.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.rs b/tests/ui/editions/edition-raw-pointer-method-2015.rs
index fcfe493c1..fcfe493c1 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.rs
+++ b/tests/ui/editions/edition-raw-pointer-method-2015.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr b/tests/ui/editions/edition-raw-pointer-method-2015.stderr
index 612dd17e7..612dd17e7 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
+++ b/tests/ui/editions/edition-raw-pointer-method-2015.stderr
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.rs b/tests/ui/editions/edition-raw-pointer-method-2018.rs
index af0b2d6bd..af0b2d6bd 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2018.rs
+++ b/tests/ui/editions/edition-raw-pointer-method-2018.rs
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr b/tests/ui/editions/edition-raw-pointer-method-2018.stderr
index 23452495b..23452495b 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr
+++ b/tests/ui/editions/edition-raw-pointer-method-2018.stderr
diff --git a/src/test/ui/editions/epoch-gate-feature.rs b/tests/ui/editions/epoch-gate-feature.rs
index 5f7feb534..5f7feb534 100644
--- a/src/test/ui/editions/epoch-gate-feature.rs
+++ b/tests/ui/editions/epoch-gate-feature.rs