Merging upstream version 1.68.2+dfsg1.

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

33 files changed, 23 insertions, 0 deletions

diff --git a/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs b/tests/ui/where-clauses/auxiliary/where_clauses_xc.rs
index 7c8043b20..7c8043b20 100644
--- a/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
+++ b/tests/ui/where-clauses/auxiliary/where_clauses_xc.rs
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.quiet.stderr b/tests/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
index 30248a7a3..30248a7a3 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.quiet.stderr
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.rs b/tests/ui/where-clauses/higher-ranked-fn-type.rs
index c19e75eb7..c19e75eb7 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.rs
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.rs
diff --git a/src/test/ui/where-clauses/higher-ranked-fn-type.verbose.stderr b/tests/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
index 268cef6e2..268cef6e2 100644
--- a/src/test/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
+++ b/tests/ui/where-clauses/higher-ranked-fn-type.verbose.stderr
diff --git a/tests/ui/where-clauses/ignore-err-clauses.rs b/tests/ui/where-clauses/ignore-err-clauses.rs
new file mode 100644
index 000000000..c76f0e1a8
--- /dev/null
+++ b/tests/ui/where-clauses/ignore-err-clauses.rs
@@ -0,0 +1,14 @@
+use std::ops::Add;
+
+fn dbl<T>(x: T) -> <T as Add>::Output
+where
+    T: Copy + Add,
+    UUU: Copy,
+    //~^ ERROR cannot find type `UUU` in this scope
+{
+    x + x
+}
+
+fn main() {
+    println!("{}", dbl(3));
+}
diff --git a/tests/ui/where-clauses/ignore-err-clauses.stderr b/tests/ui/where-clauses/ignore-err-clauses.stderr
new file mode 100644
index 000000000..cfddc3e10
--- /dev/null
+++ b/tests/ui/where-clauses/ignore-err-clauses.stderr
@@ -0,0 +1,9 @@
+error[E0412]: cannot find type `UUU` in this scope
+  --> $DIR/ignore-err-clauses.rs:6:5
+   |
+LL |     UUU: Copy,
+   |     ^^^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs b/tests/ui/where-clauses/where-clause-bounds-inconsistency.rs
index cf7d06b61..cf7d06b61 100644
--- a/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs
+++ b/tests/ui/where-clauses/where-clause-bounds-inconsistency.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
index 0e8bb61a7..0e8bb61a7 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
index 43fbc0a90..43fbc0a90 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
index 25c46330e..25c46330e 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
index f2db8fcc4..f2db8fcc4 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
+++ b/tests/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
diff --git a/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs b/tests/ui/where-clauses/where-clause-early-bound-lifetimes.rs
index 6fc570b9b..6fc570b9b 100644
--- a/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs
+++ b/tests/ui/where-clauses/where-clause-early-bound-lifetimes.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs b/tests/ui/where-clauses/where-clause-method-substituion-rpass.rs
index daa3c8dd8..daa3c8dd8 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs
+++ b/tests/ui/where-clauses/where-clause-method-substituion-rpass.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.rs b/tests/ui/where-clauses/where-clause-method-substituion.rs
index 4607783c0..4607783c0 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion.rs
+++ b/tests/ui/where-clauses/where-clause-method-substituion.rs
diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.stderr b/tests/ui/where-clauses/where-clause-method-substituion.stderr
index 8c47ed6d4..8c47ed6d4 100644
--- a/src/test/ui/where-clauses/where-clause-method-substituion.stderr
+++ b/tests/ui/where-clauses/where-clause-method-substituion.stderr
diff --git a/src/test/ui/where-clauses/where-clause-region-outlives.rs b/tests/ui/where-clauses/where-clause-region-outlives.rs
index 84925345d..84925345d 100644
--- a/src/test/ui/where-clauses/where-clause-region-outlives.rs
+++ b/tests/ui/where-clauses/where-clause-region-outlives.rs
diff --git a/src/test/ui/where-clauses/where-clauses-cross-crate.rs b/tests/ui/where-clauses/where-clauses-cross-crate.rs
index 9edf0bd5b..9edf0bd5b 100644
--- a/src/test/ui/where-clauses/where-clauses-cross-crate.rs
+++ b/tests/ui/where-clauses/where-clauses-cross-crate.rs
diff --git a/src/test/ui/where-clauses/where-clauses-lifetimes.rs b/tests/ui/where-clauses/where-clauses-lifetimes.rs
index 4bfd9e659..4bfd9e659 100644
--- a/src/test/ui/where-clauses/where-clauses-lifetimes.rs
+++ b/tests/ui/where-clauses/where-clauses-lifetimes.rs
diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs b/tests/ui/where-clauses/where-clauses-method-unsatisfied.rs
index a8ae02964..a8ae02964 100644
--- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs
+++ b/tests/ui/where-clauses/where-clauses-method-unsatisfied.rs
diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr b/tests/ui/where-clauses/where-clauses-method-unsatisfied.stderr
index e90502977..e90502977 100644
--- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr
+++ b/tests/ui/where-clauses/where-clauses-method-unsatisfied.stderr
diff --git a/src/test/ui/where-clauses/where-clauses-method.rs b/tests/ui/where-clauses/where-clauses-method.rs
index feecff435..feecff435 100644
--- a/src/test/ui/where-clauses/where-clauses-method.rs
+++ b/tests/ui/where-clauses/where-clauses-method.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs b/tests/ui/where-clauses/where-clauses-unboxed-closures.rs
index 6964cfa2e..6964cfa2e 100644
--- a/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs
+++ b/tests/ui/where-clauses/where-clauses-unboxed-closures.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs b/tests/ui/where-clauses/where-clauses-unsatisfied.rs
index 8b067d30a..8b067d30a 100644
--- a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs
+++ b/tests/ui/where-clauses/where-clauses-unsatisfied.rs
diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr b/tests/ui/where-clauses/where-clauses-unsatisfied.stderr
index b1805a452..b1805a452 100644
--- a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr
+++ b/tests/ui/where-clauses/where-clauses-unsatisfied.stderr
diff --git a/src/test/ui/where-clauses/where-clauses.rs b/tests/ui/where-clauses/where-clauses.rs
index 905ef7c5e..905ef7c5e 100644
--- a/src/test/ui/where-clauses/where-clauses.rs
+++ b/tests/ui/where-clauses/where-clauses.rs
diff --git a/src/test/ui/where-clauses/where-equality-constraints.rs b/tests/ui/where-clauses/where-equality-constraints.rs
index 8828f09d9..8828f09d9 100644
--- a/src/test/ui/where-clauses/where-equality-constraints.rs
+++ b/tests/ui/where-clauses/where-equality-constraints.rs
diff --git a/src/test/ui/where-clauses/where-equality-constraints.stderr b/tests/ui/where-clauses/where-equality-constraints.stderr
index 9d8fac02e..9d8fac02e 100644
--- a/src/test/ui/where-clauses/where-equality-constraints.stderr
+++ b/tests/ui/where-clauses/where-equality-constraints.stderr
diff --git a/src/test/ui/where-clauses/where-for-self-2.rs b/tests/ui/where-clauses/where-for-self-2.rs
index 37c6954fd..37c6954fd 100644
--- a/src/test/ui/where-clauses/where-for-self-2.rs
+++ b/tests/ui/where-clauses/where-for-self-2.rs
diff --git a/src/test/ui/where-clauses/where-for-self-2.stderr b/tests/ui/where-clauses/where-for-self-2.stderr
index f65db78fc..f65db78fc 100644
--- a/src/test/ui/where-clauses/where-for-self-2.stderr
+++ b/tests/ui/where-clauses/where-for-self-2.stderr
diff --git a/src/test/ui/where-clauses/where-for-self.rs b/tests/ui/where-clauses/where-for-self.rs
index 9380e72cd..9380e72cd 100644
--- a/src/test/ui/where-clauses/where-for-self.rs
+++ b/tests/ui/where-clauses/where-for-self.rs
diff --git a/src/test/ui/where-clauses/where-for-self.stderr b/tests/ui/where-clauses/where-for-self.stderr
index d06afc1e4..d06afc1e4 100644
--- a/src/test/ui/where-clauses/where-for-self.stderr
+++ b/tests/ui/where-clauses/where-for-self.stderr
diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.rs b/tests/ui/where-clauses/where-lifetime-resolution.rs
index d8677ee95..d8677ee95 100644
--- a/src/test/ui/where-clauses/where-lifetime-resolution.rs
+++ b/tests/ui/where-clauses/where-lifetime-resolution.rs
diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.stderr b/tests/ui/where-clauses/where-lifetime-resolution.stderr
index e8df02fba..e8df02fba 100644
--- a/src/test/ui/where-clauses/where-lifetime-resolution.stderr
+++ b/tests/ui/where-clauses/where-lifetime-resolution.stderr