Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 157 deletions

diff --git a/src/test/ui/borrowck/or-patterns.stderr b/src/test/ui/borrowck/or-patterns.stderr
deleted file mode 100644
index 9501798bb..000000000
--- a/src/test/ui/borrowck/or-patterns.stderr
+++ /dev/null
@@ -1,157 +0,0 @@
-error[E0382]: borrow of moved value: `x.0.0`
-  --> $DIR/or-patterns.rs:8:5
-   |
-LL |         ((y, _) | (_, y),) => (),
-   |           - value moved here
-LL |     }
-LL |     &x.0 .0;
-   |     ^^^^^^^ value borrowed here after move
-   |
-   = note: move occurs because `x.0.0` has type `String`, which does not implement the `Copy` trait
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         ((ref y, _) | (_, y),) => (),
-   |           +++
-
-error[E0382]: borrow of moved value: `x.0.1`
-  --> $DIR/or-patterns.rs:10:5
-   |
-LL |         ((y, _) | (_, y),) => (),
-   |                       - value moved here
-...
-LL |     &x.0 .1;
-   |     ^^^^^^^ value borrowed here after move
-   |
-   = note: move occurs because `x.0.1` has type `String`, which does not implement the `Copy` trait
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         ((y, _) | (_, ref y),) => (),
-   |                       +++
-
-error[E0502]: cannot borrow `x.0.0` as mutable because it is also borrowed as immutable
-  --> $DIR/or-patterns.rs:18:5
-   |
-LL |         ((ref y, _) | (_, ref y),) => y,
-   |           ----- immutable borrow occurs here
-LL |     };
-LL |     &mut x.0 .0;
-   |     ^^^^^^^^^^^ mutable borrow occurs here
-...
-LL |     drop(r);
-   |          - immutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.1` as mutable because it is also borrowed as immutable
-  --> $DIR/or-patterns.rs:20:5
-   |
-LL |         ((ref y, _) | (_, ref y),) => y,
-   |                           ----- immutable borrow occurs here
-...
-LL |     &mut x.0 .1;
-   |     ^^^^^^^^^^^ mutable borrow occurs here
-LL |
-LL |     drop(r);
-   |          - immutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.0` as immutable because it is also borrowed as mutable
-  --> $DIR/or-patterns.rs:29:5
-   |
-LL |         ((ref mut y, _) | (_, ref mut y),) => y,
-   |           --------- mutable borrow occurs here
-LL |     };
-LL |     &x.0 .0;
-   |     ^^^^^^^ immutable borrow occurs here
-...
-LL |     drop(r);
-   |          - mutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.1` as immutable because it is also borrowed as mutable
-  --> $DIR/or-patterns.rs:31:5
-   |
-LL |         ((ref mut y, _) | (_, ref mut y),) => y,
-   |                               --------- mutable borrow occurs here
-...
-LL |     &x.0 .1;
-   |     ^^^^^^^ immutable borrow occurs here
-LL |
-LL |     drop(r);
-   |          - mutable borrow later used here
-
-error[E0382]: borrow of moved value: `x.0.0`
-  --> $DIR/or-patterns.rs:38:5
-   |
-LL |     let ((y, _) | (_, y),) = x;
-   |           - value moved here
-LL |     &x.0 .0;
-   |     ^^^^^^^ value borrowed here after move
-   |
-   = note: move occurs because `x.0.0` has type `String`, which does not implement the `Copy` trait
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |     let ((ref y, _) | (_, y),) = x;
-   |           +++
-
-error[E0382]: borrow of moved value: `x.0.1`
-  --> $DIR/or-patterns.rs:40:5
-   |
-LL |     let ((y, _) | (_, y),) = x;
-   |                       - value moved here
-...
-LL |     &x.0 .1;
-   |     ^^^^^^^ value borrowed here after move
-   |
-   = note: move occurs because `x.0.1` has type `String`, which does not implement the `Copy` trait
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |     let ((y, _) | (_, ref y),) = x;
-   |                       +++
-
-error[E0502]: cannot borrow `x.0.0` as mutable because it is also borrowed as immutable
-  --> $DIR/or-patterns.rs:46:5
-   |
-LL |     let ((ref r, _) | (_, ref r),) = x;
-   |           ----- immutable borrow occurs here
-LL |     &mut x.0 .0;
-   |     ^^^^^^^^^^^ mutable borrow occurs here
-...
-LL |     drop(r);
-   |          - immutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.1` as mutable because it is also borrowed as immutable
-  --> $DIR/or-patterns.rs:48:5
-   |
-LL |     let ((ref r, _) | (_, ref r),) = x;
-   |                           ----- immutable borrow occurs here
-...
-LL |     &mut x.0 .1;
-   |     ^^^^^^^^^^^ mutable borrow occurs here
-LL |
-LL |     drop(r);
-   |          - immutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.0` as immutable because it is also borrowed as mutable
-  --> $DIR/or-patterns.rs:55:5
-   |
-LL |     let ((ref mut r, _) | (_, ref mut r),) = x;
-   |           --------- mutable borrow occurs here
-LL |     &x.0 .0;
-   |     ^^^^^^^ immutable borrow occurs here
-...
-LL |     drop(r);
-   |          - mutable borrow later used here
-
-error[E0502]: cannot borrow `x.0.1` as immutable because it is also borrowed as mutable
-  --> $DIR/or-patterns.rs:57:5
-   |
-LL |     let ((ref mut r, _) | (_, ref mut r),) = x;
-   |                               --------- mutable borrow occurs here
-...
-LL |     &x.0 .1;
-   |     ^^^^^^^ immutable borrow occurs here
-LL |
-LL |     drop(r);
-   |          - mutable borrow later used here
-
-error: aborting due to 12 previous errors
-
-Some errors have detailed explanations: E0382, E0502.
-For more information about an error, try `rustc --explain E0382`.