Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/ui/suggestions/option-content-move.stderr b/tests/ui/suggestions/option-content-move.stderr
new file mode 100644
index 000000000..474a72093
--- /dev/null
+++ b/tests/ui/suggestions/option-content-move.stderr
@@ -0,0 +1,35 @@
+error[E0507]: cannot move out of `selection.1` which is behind a shared reference
+  --> $DIR/option-content-move.rs:9:20
+   |
+LL |                 if selection.1.unwrap().contains(selection.0) {
+   |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
+   |                    |
+   |                    help: consider calling `.as_ref()` or `.as_mut()` to borrow the type's contents
+   |                    move occurs because `selection.1` has type `Option<String>`, which does not implement the `Copy` trait
+   |
+note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves `selection.1`
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |                 if selection.1.clone().unwrap().contains(selection.0) {
+   |                                ++++++++
+
+error[E0507]: cannot move out of `selection.1` which is behind a shared reference
+  --> $DIR/option-content-move.rs:27:20
+   |
+LL |                 if selection.1.unwrap().contains(selection.0) {
+   |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
+   |                    |
+   |                    help: consider calling `.as_ref()` or `.as_mut()` to borrow the type's contents
+   |                    move occurs because `selection.1` has type `Result<String, String>`, which does not implement the `Copy` trait
+   |
+note: `Result::<T, E>::unwrap` takes ownership of the receiver `self`, which moves `selection.1`
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |                 if selection.1.clone().unwrap().contains(selection.0) {
+   |                                ++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.