Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 55 deletions

diff --git a/src/test/ui/suggestions/mut-ref-reassignment.stderr b/src/test/ui/suggestions/mut-ref-reassignment.stderr
deleted file mode 100644
index b3cb6dd06..000000000
--- a/src/test/ui/suggestions/mut-ref-reassignment.stderr
+++ /dev/null
@@ -1,55 +0,0 @@
-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`.