Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 79 insertions, 0 deletions

diff --git a/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
new file mode 100644
index 000000000..c8b45fd24
--- /dev/null
+++ b/tests/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
@@ -0,0 +1,79 @@
+error: cannot move out of value because it is borrowed
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:12:14
+   |
+LL |         Some(ref _y @ _z) => {}
+   |              ------^^^--
+   |              |        |
+   |              |        value moved into `_z` here
+   |              value borrowed, by `_y`, here
+
+error: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:19:14
+   |
+LL |         Some(_z @ ref _y) => {}
+   |              --^^^------
+   |              |    |
+   |              |    value borrowed here after move
+   |              value moved into `_z` here
+   |              move occurs because `_z` has type `X` which does not implement the `Copy` trait
+   |
+help: borrow this binding in the pattern to avoid moving the value
+   |
+LL |         Some(ref _z @ ref _y) => {}
+   |              +++
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:26:14
+   |
+LL |         Some(ref mut _y @ _z) => {}
+   |              ----------^^^--
+   |              |            |
+   |              |            value moved into `_z` here
+   |              value borrowed, by `_y`, here
+
+error: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:33:14
+   |
+LL |         Some(_z @ ref mut _y) => {}
+   |              --^^^----------
+   |              |    |
+   |              |    value borrowed here after move
+   |              value moved into `_z` here
+   |              move occurs because `_z` has type `X` which does not implement the `Copy` trait
+   |
+help: borrow this binding in the pattern to avoid moving the value
+   |
+LL |         Some(ref _z @ ref mut _y) => {}
+   |              +++
+
+error[E0382]: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:12:14
+   |
+LL |         Some(ref _y @ _z) => {}
+   |              ^^^^^^   -- value moved here
+   |              |
+   |              value borrowed here after move
+   |
+   = note: move occurs because value has type `X`, which does not implement the `Copy` trait
+help: borrow this binding in the pattern to avoid moving the value
+   |
+LL |         Some(ref _y @ ref _z) => {}
+   |                       +++
+
+error[E0382]: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:26:14
+   |
+LL |         Some(ref mut _y @ _z) => {}
+   |              ^^^^^^^^^^   -- value moved here
+   |              |
+   |              value borrowed here after move
+   |
+   = note: move occurs because value has type `X`, which does not implement the `Copy` trait
+help: borrow this binding in the pattern to avoid moving the value
+   |
+LL |         Some(ref mut _y @ ref _z) => {}
+   |                           +++
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0382`.