Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 52 deletions

diff --git a/src/test/ui/nll/match-on-borrowed.stderr b/src/test/ui/nll/match-on-borrowed.stderr
deleted file mode 100644
index 32666529f..000000000
--- a/src/test/ui/nll/match-on-borrowed.stderr
+++ /dev/null
@@ -1,52 +0,0 @@
-error[E0503]: cannot use `e` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:47:11
-   |
-LL |         E::V(ref mut x, _) => x,
-   |              --------- borrow of `e.0` occurs here
-...
-LL |     match e { // Don't know that E uses a tag for its discriminant
-   |           ^ use of borrowed `e.0`
-...
-LL |     x;
-   |     - borrow later used here
-
-error[E0503]: cannot use `*f` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:61:11
-   |
-LL |         E::V(ref mut x, _) => x,
-   |              --------- borrow of `f.0` occurs here
-...
-LL |     match f { // Don't know that E uses a tag for its discriminant
-   |           ^ use of borrowed `f.0`
-...
-LL |     x;
-   |     - borrow later used here
-
-error[E0503]: cannot use `t` because it was mutably borrowed
-  --> $DIR/match-on-borrowed.rs:81:5
-   |
-LL |     let x = &mut t;
-   |             ------ borrow of `t` occurs here
-LL |     match t {
-   |     ^^^^^^^ use of borrowed `t`
-...
-LL |     x;
-   |     - borrow later used here
-
-error[E0381]: used binding `n` isn't initialized
-  --> $DIR/match-on-borrowed.rs:93:11
-   |
-LL |     let n: Never;
-   |         - binding declared here but left uninitialized
-LL |     match n {}
-   |           ^ `n` used here but it isn't initialized
-   |
-help: consider assigning a value
-   |
-LL |     let n: Never = todo!();
-   |                  +++++++++
-
-error: aborting due to 4 previous errors
-
-Some errors have detailed explanations: E0381, E0503.
-For more information about an error, try `rustc --explain E0381`.