Merging upstream version 1.68.2+dfsg1.

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

61 files changed, 2 insertions, 5 deletions

diff --git a/src/test/ui/or-patterns/already-bound-name.rs b/tests/ui/or-patterns/already-bound-name.rs
index 65c25293d..65c25293d 100644
--- a/src/test/ui/or-patterns/already-bound-name.rs
+++ b/tests/ui/or-patterns/already-bound-name.rs
diff --git a/src/test/ui/or-patterns/already-bound-name.stderr b/tests/ui/or-patterns/already-bound-name.stderr
index 368782c1e..368782c1e 100644
--- a/src/test/ui/or-patterns/already-bound-name.stderr
+++ b/tests/ui/or-patterns/already-bound-name.stderr
diff --git a/src/test/ui/or-patterns/basic-switch.rs b/tests/ui/or-patterns/basic-switch.rs
index 674fbc3cc..674fbc3cc 100644
--- a/src/test/ui/or-patterns/basic-switch.rs
+++ b/tests/ui/or-patterns/basic-switch.rs
diff --git a/src/test/ui/or-patterns/basic-switchint.rs b/tests/ui/or-patterns/basic-switchint.rs
index adb902caf..adb902caf 100644
--- a/src/test/ui/or-patterns/basic-switchint.rs
+++ b/tests/ui/or-patterns/basic-switchint.rs
diff --git a/src/test/ui/or-patterns/bindings-runpass-1.rs b/tests/ui/or-patterns/bindings-runpass-1.rs
index 3406d5197..3406d5197 100644
--- a/src/test/ui/or-patterns/bindings-runpass-1.rs
+++ b/tests/ui/or-patterns/bindings-runpass-1.rs
diff --git a/src/test/ui/or-patterns/bindings-runpass-2.rs b/tests/ui/or-patterns/bindings-runpass-2.rs
index 5b9bb748c..5b9bb748c 100644
--- a/src/test/ui/or-patterns/bindings-runpass-2.rs
+++ b/tests/ui/or-patterns/bindings-runpass-2.rs
diff --git a/src/test/ui/or-patterns/box-patterns.rs b/tests/ui/or-patterns/box-patterns.rs
index 73051401c..73051401c 100644
--- a/src/test/ui/or-patterns/box-patterns.rs
+++ b/tests/ui/or-patterns/box-patterns.rs
diff --git a/src/test/ui/or-patterns/consistent-bindings.rs b/tests/ui/or-patterns/consistent-bindings.rs
index ecae1d8a2..ecae1d8a2 100644
--- a/src/test/ui/or-patterns/consistent-bindings.rs
+++ b/tests/ui/or-patterns/consistent-bindings.rs
diff --git a/src/test/ui/or-patterns/const-fn.rs b/tests/ui/or-patterns/const-fn.rs
index ca512ac71..ca512ac71 100644
--- a/src/test/ui/or-patterns/const-fn.rs
+++ b/tests/ui/or-patterns/const-fn.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.rs
index 5999e04e0..5999e04e0 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs
+++ b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
index 9aa808e6b..9aa808e6b 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
+++ b/tests/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
diff --git a/src/test/ui/or-patterns/exhaustiveness-pass.rs b/tests/ui/or-patterns/exhaustiveness-pass.rs
index e8c8a0e7b..e8c8a0e7b 100644
--- a/src/test/ui/or-patterns/exhaustiveness-pass.rs
+++ b/tests/ui/or-patterns/exhaustiveness-pass.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
index 8429799ca..8429799ca 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
+++ b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
index 3f7d47dcb..3f7d47dcb 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
+++ b/tests/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.fixed b/tests/ui/or-patterns/fn-param-wrap-parens.fixed
index b9490aaf9..b9490aaf9 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.fixed
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.fixed
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.rs b/tests/ui/or-patterns/fn-param-wrap-parens.rs
index 8e703d274..8e703d274 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.rs
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.rs
diff --git a/src/test/ui/or-patterns/fn-param-wrap-parens.stderr b/tests/ui/or-patterns/fn-param-wrap-parens.stderr
index 732702841..732702841 100644
--- a/src/test/ui/or-patterns/fn-param-wrap-parens.stderr
+++ b/tests/ui/or-patterns/fn-param-wrap-parens.stderr
diff --git a/src/test/ui/or-patterns/for-loop.rs b/tests/ui/or-patterns/for-loop.rs
index 11b61cb69..11b61cb69 100644
--- a/src/test/ui/or-patterns/for-loop.rs
+++ b/tests/ui/or-patterns/for-loop.rs
diff --git a/src/test/ui/or-patterns/if-let-while-let.rs b/tests/ui/or-patterns/if-let-while-let.rs
index 92a1bb256..92a1bb256 100644
--- a/src/test/ui/or-patterns/if-let-while-let.rs
+++ b/tests/ui/or-patterns/if-let-while-let.rs
diff --git a/src/test/ui/or-patterns/inconsistent-modes.rs b/tests/ui/or-patterns/inconsistent-modes.rs
index a87a10ce8..a87a10ce8 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.rs
+++ b/tests/ui/or-patterns/inconsistent-modes.rs
diff --git a/src/test/ui/or-patterns/inconsistent-modes.stderr b/tests/ui/or-patterns/inconsistent-modes.stderr
index f6367ef82..f6367ef82 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.stderr
+++ b/tests/ui/or-patterns/inconsistent-modes.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.or3.stderr b/tests/ui/or-patterns/inner-or-pat.or3.stderr
index 2236a38c3..2236a38c3 100644
--- a/src/test/ui/or-patterns/inner-or-pat.or3.stderr
+++ b/tests/ui/or-patterns/inner-or-pat.or3.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.or4.stderr b/tests/ui/or-patterns/inner-or-pat.or4.stderr
index 058873ff5..058873ff5 100644
--- a/src/test/ui/or-patterns/inner-or-pat.or4.stderr
+++ b/tests/ui/or-patterns/inner-or-pat.or4.stderr
diff --git a/src/test/ui/or-patterns/inner-or-pat.rs b/tests/ui/or-patterns/inner-or-pat.rs
index f4cf4b0c1..f4cf4b0c1 100644
--- a/src/test/ui/or-patterns/inner-or-pat.rs
+++ b/tests/ui/or-patterns/inner-or-pat.rs
diff --git a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.rs b/tests/ui/or-patterns/issue-64879-trailing-before-guard.rs
index 181c77009..181c77009 100644
--- a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.rs
+++ b/tests/ui/or-patterns/issue-64879-trailing-before-guard.rs
diff --git a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.stderr b/tests/ui/or-patterns/issue-64879-trailing-before-guard.stderr
index 9b827794f..9b827794f 100644
--- a/src/test/ui/or-patterns/issue-64879-trailing-before-guard.stderr
+++ b/tests/ui/or-patterns/issue-64879-trailing-before-guard.stderr
diff --git a/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs b/tests/ui/or-patterns/issue-67514-irrefutable-param.rs
index 73931def8..73931def8 100644
--- a/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs
+++ b/tests/ui/or-patterns/issue-67514-irrefutable-param.rs
diff --git a/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs b/tests/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
index 7339a7e23..7339a7e23 100644
--- a/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
+++ b/tests/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
index 3538aad5d..3538aad5d 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
index 95b22ac05..4adcf4fee 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier-non-exhaustive.stderr
@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in local binding: `i32::MIN..=-1_i32` and `3_i32..=i32::MAX` not covered
+error[E0005]: refutable pattern in local binding
   --> $DIR/issue-69875-should-have-been-expanded-earlier-non-exhaustive.rs:2:10
    |
 LL |     let (0 | (1 | 2)) = 0;
diff --git a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
index 408ac24f3..408ac24f3 100644
--- a/src/test/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
+++ b/tests/ui/or-patterns/issue-69875-should-have-been-expanded-earlier.rs
diff --git a/src/test/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs b/tests/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
index 8a3c640b1..8a3c640b1 100644
--- a/src/test/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
+++ b/tests/ui/or-patterns/issue-70413-no-unreachable-pat-and-guard.rs
diff --git a/src/test/ui/or-patterns/let-pattern.rs b/tests/ui/or-patterns/let-pattern.rs
index 97207e83e..97207e83e 100644
--- a/src/test/ui/or-patterns/let-pattern.rs
+++ b/tests/ui/or-patterns/let-pattern.rs
diff --git a/src/test/ui/or-patterns/macro-pat.rs b/tests/ui/or-patterns/macro-pat.rs
index 20d8f84c2..20d8f84c2 100644
--- a/src/test/ui/or-patterns/macro-pat.rs
+++ b/tests/ui/or-patterns/macro-pat.rs
diff --git a/src/test/ui/or-patterns/mismatched-bindings-async-fn.rs b/tests/ui/or-patterns/mismatched-bindings-async-fn.rs
index d1cb73aaf..d1cb73aaf 100644
--- a/src/test/ui/or-patterns/mismatched-bindings-async-fn.rs
+++ b/tests/ui/or-patterns/mismatched-bindings-async-fn.rs
diff --git a/src/test/ui/or-patterns/mismatched-bindings-async-fn.stderr b/tests/ui/or-patterns/mismatched-bindings-async-fn.stderr
index 81602fffa..81602fffa 100644
--- a/src/test/ui/or-patterns/mismatched-bindings-async-fn.stderr
+++ b/tests/ui/or-patterns/mismatched-bindings-async-fn.stderr
diff --git a/src/test/ui/or-patterns/missing-bindings.rs b/tests/ui/or-patterns/missing-bindings.rs
index 7c26012c0..7c26012c0 100644
--- a/src/test/ui/or-patterns/missing-bindings.rs
+++ b/tests/ui/or-patterns/missing-bindings.rs
diff --git a/src/test/ui/or-patterns/missing-bindings.stderr b/tests/ui/or-patterns/missing-bindings.stderr
index 8fafa275b..8fafa275b 100644
--- a/src/test/ui/or-patterns/missing-bindings.stderr
+++ b/tests/ui/or-patterns/missing-bindings.stderr
diff --git a/src/test/ui/or-patterns/mix-with-wild.rs b/tests/ui/or-patterns/mix-with-wild.rs
index d9911cda1..d9911cda1 100644
--- a/src/test/ui/or-patterns/mix-with-wild.rs
+++ b/tests/ui/or-patterns/mix-with-wild.rs
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.rs b/tests/ui/or-patterns/multiple-pattern-typo.rs
index 5f2012533..5f2012533 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.rs
+++ b/tests/ui/or-patterns/multiple-pattern-typo.rs
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.stderr b/tests/ui/or-patterns/multiple-pattern-typo.stderr
index b0a82b367..b0a82b367 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.stderr
+++ b/tests/ui/or-patterns/multiple-pattern-typo.stderr
diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.rs b/tests/ui/or-patterns/nested-undelimited-precedence.rs
index 047836203..047836203 100644
--- a/src/test/ui/or-patterns/nested-undelimited-precedence.rs
+++ b/tests/ui/or-patterns/nested-undelimited-precedence.rs
diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr b/tests/ui/or-patterns/nested-undelimited-precedence.stderr
index 2e25d8b3e..2e25d8b3e 100644
--- a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr
+++ b/tests/ui/or-patterns/nested-undelimited-precedence.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.rs
index fa470de7f..fa470de7f 100644
--- a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
+++ b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.rs
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
index 00ce46c56..00ce46c56 100644
--- a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
+++ b/tests/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs b/tests/ui/or-patterns/or-patterns-default-binding-modes.rs
index e56f9ffe2..e56f9ffe2 100644
--- a/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs
+++ b/tests/ui/or-patterns/or-patterns-default-binding-modes.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
index a624cbc89..a624cbc89 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
index acc2099bb..acc2099bb 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs b/tests/ui/or-patterns/or-patterns-syntactic-fail.rs
index 358e9d034..358e9d034 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr b/tests/ui/or-patterns/or-patterns-syntactic-fail.stderr
index 920720a4f..10d42b7e3 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-fail.stderr
@@ -35,11 +35,8 @@ note: an implementation of `BitOr<_>` might be missing for `E`
    |
 LL | enum E { A, B }
    | ^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitOr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass-2021.rs b/tests/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
index c0d148d92..c0d148d92 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass-2021.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs b/tests/ui/or-patterns/or-patterns-syntactic-pass.rs
index 92750bec8..92750bec8 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass.rs
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr b/tests/ui/or-patterns/or-patterns-syntactic-pass.stderr
index c43fe192a..c43fe192a 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr
+++ b/tests/ui/or-patterns/or-patterns-syntactic-pass.stderr
diff --git a/src/test/ui/or-patterns/remove-leading-vert.fixed b/tests/ui/or-patterns/remove-leading-vert.fixed
index b1cd0a944..b1cd0a944 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.fixed
+++ b/tests/ui/or-patterns/remove-leading-vert.fixed
diff --git a/src/test/ui/or-patterns/remove-leading-vert.rs b/tests/ui/or-patterns/remove-leading-vert.rs
index dc12382aa..dc12382aa 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.rs
+++ b/tests/ui/or-patterns/remove-leading-vert.rs
diff --git a/src/test/ui/or-patterns/remove-leading-vert.stderr b/tests/ui/or-patterns/remove-leading-vert.stderr
index af51c67e1..af51c67e1 100644
--- a/src/test/ui/or-patterns/remove-leading-vert.stderr
+++ b/tests/ui/or-patterns/remove-leading-vert.stderr
diff --git a/src/test/ui/or-patterns/search-via-bindings.rs b/tests/ui/or-patterns/search-via-bindings.rs
index d98606ded..d98606ded 100644
--- a/src/test/ui/or-patterns/search-via-bindings.rs
+++ b/tests/ui/or-patterns/search-via-bindings.rs
diff --git a/src/test/ui/or-patterns/slice-patterns.rs b/tests/ui/or-patterns/slice-patterns.rs
index ed5eace0b..ed5eace0b 100644
--- a/src/test/ui/or-patterns/slice-patterns.rs
+++ b/tests/ui/or-patterns/slice-patterns.rs
diff --git a/src/test/ui/or-patterns/struct-like.rs b/tests/ui/or-patterns/struct-like.rs
index 7de690d2d..7de690d2d 100644
--- a/src/test/ui/or-patterns/struct-like.rs
+++ b/tests/ui/or-patterns/struct-like.rs
diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs b/tests/ui/or-patterns/while-parsing-this-or-pattern.rs
index b9bfb8638..b9bfb8638 100644
--- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs
+++ b/tests/ui/or-patterns/while-parsing-this-or-pattern.rs
diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr b/tests/ui/or-patterns/while-parsing-this-or-pattern.stderr
index 7ad62ff99..7ad62ff99 100644
--- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr
+++ b/tests/ui/or-patterns/while-parsing-this-or-pattern.stderr