Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 55 insertions, 0 deletions

diff --git a/tests/ui/suggestions/mut-ref-reassignment.stderr b/tests/ui/suggestions/mut-ref-reassignment.stderr
new file mode 100644
index 000000000..b3cb6dd06
--- /dev/null
+++ b/tests/ui/suggestions/mut-ref-reassignment.stderr
@@ -0,0 +1,55 @@
+error[E0308]: mismatched types
+  --> $DIR/mut-ref-reassignment.rs:2:11
+   |
+LL | fn suggestion(opt: &mut Option<String>) {
+   |                    ------------------- expected due to this parameter type
+LL |     opt = None;
+   |           ^^^^ expected mutable reference, found enum `Option`
+   |
+   = note: expected mutable reference `&mut Option<String>`
+                           found enum `Option<_>`
+help: consider dereferencing here to assign to the mutably borrowed value
+   |
+LL |     *opt = None;
+   |     +
+
+error[E0308]: mismatched types
+  --> $DIR/mut-ref-reassignment.rs:6:11
+   |
+LL | fn no_suggestion(opt: &mut Result<String, ()>) {
+   |                       ----------------------- expected due to this parameter type
+LL |     opt = None
+   |           ^^^^ expected mutable reference, found enum `Option`
+   |
+   = note: expected mutable reference `&mut Result<String, ()>`
+                           found enum `Option<_>`
+
+error[E0308]: mismatched types
+  --> $DIR/mut-ref-reassignment.rs:10:11
+   |
+LL | fn suggestion2(opt: &mut Option<String>) {
+   |                     ------------------- expected due to this parameter type
+LL |     opt = Some(String::new())
+   |           ^^^^^^^^^^^^^^^^^^^ expected mutable reference, found enum `Option`
+   |
+   = note: expected mutable reference `&mut Option<String>`
+                           found enum `Option<String>`
+help: consider dereferencing here to assign to the mutably borrowed value
+   |
+LL |     *opt = Some(String::new())
+   |     +
+
+error[E0308]: mismatched types
+  --> $DIR/mut-ref-reassignment.rs:14:11
+   |
+LL | fn no_suggestion2(opt: &mut Option<String>) {
+   |                        ------------------- expected due to this parameter type
+LL |     opt = Some(42)
+   |           ^^^^^^^^ expected mutable reference, found enum `Option`
+   |
+   = note: expected mutable reference `&mut Option<String>`
+                           found enum `Option<{integer}>`
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0308`.