100 files changed, 249 insertions, 11 deletions

diff --git a/src/test/ui/did_you_mean/E0178.rs b/tests/ui/did_you_mean/E0178.rs
index 095df640c..095df640c 100644
--- a/src/test/ui/did_you_mean/E0178.rs
+++ b/tests/ui/did_you_mean/E0178.rs
diff --git a/src/test/ui/did_you_mean/E0178.stderr b/tests/ui/did_you_mean/E0178.stderr
index 58ac6e908..58ac6e908 100644
--- a/src/test/ui/did_you_mean/E0178.stderr
+++ b/tests/ui/did_you_mean/E0178.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.rs b/tests/ui/did_you_mean/bad-assoc-expr.rs
index 1d584757f..1d584757f 100644
--- a/src/test/ui/did_you_mean/bad-assoc-expr.rs
+++ b/tests/ui/did_you_mean/bad-assoc-expr.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.stderr b/tests/ui/did_you_mean/bad-assoc-expr.stderr
index c295cac9a..c295cac9a 100644
--- a/src/test/ui/did_you_mean/bad-assoc-expr.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-expr.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.rs b/tests/ui/did_you_mean/bad-assoc-pat.rs
index 3f912f7ff..3f912f7ff 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.rs
+++ b/tests/ui/did_you_mean/bad-assoc-pat.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/tests/ui/did_you_mean/bad-assoc-pat.stderr
index 19d173f1b..19d173f1b 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-pat.stderr
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.rs b/tests/ui/did_you_mean/bad-assoc-ty.rs
index f787c416c..f787c416c 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.rs
+++ b/tests/ui/did_you_mean/bad-assoc-ty.rs
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/tests/ui/did_you_mean/bad-assoc-ty.stderr
index 21f957ab5..55096e95d 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr
+++ b/tests/ui/did_you_mean/bad-assoc-ty.stderr
@@ -61,25 +61,45 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:1:10
    |
 LL | type A = [u8; 4]::AssocTy;
-   |          ^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<[u8; 4] as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `[u8; 4]`, you could use the fully-qualified path
+   |
+LL | type A = <[u8; 4] as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:5:10
    |
 LL | type B = [u8]::AssocTy;
-   |          ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<[u8] as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `[u8]`, you could use the fully-qualified path
+   |
+LL | type B = <[u8] as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:9:10
    |
 LL | type C = (u8)::AssocTy;
-   |          ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type C = <u8 as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:13:10
    |
 LL | type D = (u8, u8)::AssocTy;
-   |          ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(u8, u8) as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `(u8, u8)`, you could use the fully-qualified path
+   |
+LL | type D = <(u8, u8) as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for type aliases
   --> $DIR/bad-assoc-ty.rs:17:10
@@ -91,13 +111,23 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:21:19
    |
 LL | type F = &'static (u8)::AssocTy;
-   |                   ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |                   ^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type F = &'static <u8 as Example>::AssocTy;
+   |                   ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:27:10
    |
 LL | type G = dyn 'static + (Send)::AssocTy;
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn Send + 'static) as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `(dyn Send + 'static)`, you could use the fully-qualified path
+   |
+LL | type G = <(dyn Send + 'static) as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 warning: trait objects without an explicit `dyn` are deprecated
   --> $DIR/bad-assoc-ty.rs:33:10
@@ -117,24 +147,33 @@ error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:33:10
    |
 LL | type H = Fn(u8) -> (u8)::Output;
-   |          ^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn Fn(u8) -> u8 + 'static) as Trait>::Output`
+   |          ^^^^^^^^^^^^^^^^^^^^^^ help: use the fully-qualified path: `<(dyn Fn(u8) -> u8 + 'static) as IntoFuture>::Output`
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:39:19
    |
 LL |     ($ty: ty) => ($ty::AssocTy);
-   |                   ^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |                   ^^^^^^^^^^^^
 ...
 LL | type J = ty!(u8);
    |          ------- in this macro invocation
    |
    = note: this error originates in the macro `ty` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL |     ($ty: ty) => (<u8 as Example>::AssocTy);
+   |                   ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:46:10
    |
 LL | type I = ty!()::AssocTy;
-   |          ^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
+   |          ^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `AssocTy` implemented for `u8`, you could use the fully-qualified path
+   |
+LL | type I = <u8 as Example>::AssocTy;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
   --> $DIR/bad-assoc-ty.rs:51:13
diff --git a/src/test/ui/did_you_mean/brackets-to-braces-single-element.rs b/tests/ui/did_you_mean/brackets-to-braces-single-element.rs
index 4d0109767..4d0109767 100644
--- a/src/test/ui/did_you_mean/brackets-to-braces-single-element.rs
+++ b/tests/ui/did_you_mean/brackets-to-braces-single-element.rs
diff --git a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr b/tests/ui/did_you_mean/brackets-to-braces-single-element.stderr
index 6ded03e45..6ded03e45 100644
--- a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr
+++ b/tests/ui/did_you_mean/brackets-to-braces-single-element.stderr
diff --git a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs b/tests/ui/did_you_mean/compatible-variants-in-pat.rs
index 09e12dab2..09e12dab2 100644
--- a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs
+++ b/tests/ui/did_you_mean/compatible-variants-in-pat.rs
diff --git a/src/test/ui/did_you_mean/compatible-variants-in-pat.stderr b/tests/ui/did_you_mean/compatible-variants-in-pat.stderr
index 473468af6..473468af6 100644
--- a/src/test/ui/did_you_mean/compatible-variants-in-pat.stderr
+++ b/tests/ui/did_you_mean/compatible-variants-in-pat.stderr
diff --git a/src/test/ui/did_you_mean/compatible-variants.rs b/tests/ui/did_you_mean/compatible-variants.rs
index b1c7dc2a7..b1c7dc2a7 100644
--- a/src/test/ui/did_you_mean/compatible-variants.rs
+++ b/tests/ui/did_you_mean/compatible-variants.rs
diff --git a/src/test/ui/did_you_mean/compatible-variants.stderr b/tests/ui/did_you_mean/compatible-variants.stderr
index fe81da198..fe81da198 100644
--- a/src/test/ui/did_you_mean/compatible-variants.stderr
+++ b/tests/ui/did_you_mean/compatible-variants.stderr
diff --git a/src/test/ui/did_you_mean/issue-103909.rs b/tests/ui/did_you_mean/issue-103909.rs
index 20b67cd10..20b67cd10 100644
--- a/src/test/ui/did_you_mean/issue-103909.rs
+++ b/tests/ui/did_you_mean/issue-103909.rs
diff --git a/src/test/ui/did_you_mean/issue-103909.stderr b/tests/ui/did_you_mean/issue-103909.stderr
index 864101747..864101747 100644
--- a/src/test/ui/did_you_mean/issue-103909.stderr
+++ b/tests/ui/did_you_mean/issue-103909.stderr
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
index 1749137d4..1749137d4 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
index b69fcd5d3..b69fcd5d3 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
index e898b224e..e898b224e 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
index 5e0e4a011..5e0e4a011 100644
--- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
+++ b/tests/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
diff --git a/src/test/ui/did_you_mean/issue-31424.rs b/tests/ui/did_you_mean/issue-31424.rs
index 95ccf2a4c..95ccf2a4c 100644
--- a/src/test/ui/did_you_mean/issue-31424.rs
+++ b/tests/ui/did_you_mean/issue-31424.rs
diff --git a/src/test/ui/did_you_mean/issue-31424.stderr b/tests/ui/did_you_mean/issue-31424.stderr
index 8fe38bf69..8fe38bf69 100644
--- a/src/test/ui/did_you_mean/issue-31424.stderr
+++ b/tests/ui/did_you_mean/issue-31424.stderr
diff --git a/src/test/ui/did_you_mean/issue-34126.rs b/tests/ui/did_you_mean/issue-34126.rs
index 53516f4f2..53516f4f2 100644
--- a/src/test/ui/did_you_mean/issue-34126.rs
+++ b/tests/ui/did_you_mean/issue-34126.rs
diff --git a/src/test/ui/did_you_mean/issue-34126.stderr b/tests/ui/did_you_mean/issue-34126.stderr
index 5343acea4..5343acea4 100644
--- a/src/test/ui/did_you_mean/issue-34126.stderr
+++ b/tests/ui/did_you_mean/issue-34126.stderr
diff --git a/src/test/ui/did_you_mean/issue-34337.rs b/tests/ui/did_you_mean/issue-34337.rs
index e89eda33f..e89eda33f 100644
--- a/src/test/ui/did_you_mean/issue-34337.rs
+++ b/tests/ui/did_you_mean/issue-34337.rs
diff --git a/src/test/ui/did_you_mean/issue-34337.stderr b/tests/ui/did_you_mean/issue-34337.stderr
index 1f18ea892..1f18ea892 100644
--- a/src/test/ui/did_you_mean/issue-34337.stderr
+++ b/tests/ui/did_you_mean/issue-34337.stderr
diff --git a/src/test/ui/did_you_mean/issue-35937.rs b/tests/ui/did_you_mean/issue-35937.rs
index ebeba74f1..ebeba74f1 100644
--- a/src/test/ui/did_you_mean/issue-35937.rs
+++ b/tests/ui/did_you_mean/issue-35937.rs
diff --git a/tests/ui/did_you_mean/issue-35937.stderr b/tests/ui/did_you_mean/issue-35937.stderr
new file mode 100644
index 000000000..1670da559
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-35937.stderr
@@ -0,0 +1,37 @@
+error[E0596]: cannot borrow `f.v` as mutable, as `f` is not declared as mutable
+  --> $DIR/issue-35937.rs:7:5
+   |
+LL |     f.v.push("cat".to_string());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut f = Foo { v: Vec::new() };
+   |         +++
+
+error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable
+  --> $DIR/issue-35937.rs:16:5
+   |
+LL |     s.x += 1;
+   |     ^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut s = S { x: 42 };
+   |         +++
+
+error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable
+  --> $DIR/issue-35937.rs:20:5
+   |
+LL |     s.x += 1;
+   |     ^^^^^^^^ cannot assign
+   |
+help: consider changing this to be mutable
+   |
+LL | fn bar(mut s: S) {
+   |        +++
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-36798.rs b/tests/ui/did_you_mean/issue-36798.rs
index 89d71d831..89d71d831 100644
--- a/src/test/ui/did_you_mean/issue-36798.rs
+++ b/tests/ui/did_you_mean/issue-36798.rs
diff --git a/src/test/ui/did_you_mean/issue-36798.stderr b/tests/ui/did_you_mean/issue-36798.stderr
index 98876e305..98876e305 100644
--- a/src/test/ui/did_you_mean/issue-36798.stderr
+++ b/tests/ui/did_you_mean/issue-36798.stderr
diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs b/tests/ui/did_you_mean/issue-36798_unknown_field.rs
index ef9744b4a..ef9744b4a 100644
--- a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs
+++ b/tests/ui/did_you_mean/issue-36798_unknown_field.rs
diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr b/tests/ui/did_you_mean/issue-36798_unknown_field.stderr
index 2ed0a0924..2ed0a0924 100644
--- a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr
+++ b/tests/ui/did_you_mean/issue-36798_unknown_field.stderr
diff --git a/src/test/ui/did_you_mean/issue-37139.rs b/tests/ui/did_you_mean/issue-37139.rs
index 6a19d85ff..6a19d85ff 100644
--- a/src/test/ui/did_you_mean/issue-37139.rs
+++ b/tests/ui/did_you_mean/issue-37139.rs
diff --git a/src/test/ui/did_you_mean/issue-37139.stderr b/tests/ui/did_you_mean/issue-37139.stderr
index dc1bdfaae..dc1bdfaae 100644
--- a/src/test/ui/did_you_mean/issue-37139.stderr
+++ b/tests/ui/did_you_mean/issue-37139.stderr
diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
index a1ef68ecf..a1ef68ecf 100644
--- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
+++ b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs
diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
index 852abaed7..852abaed7 100644
--- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
+++ b/tests/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-1.rs b/tests/ui/did_you_mean/issue-38147-1.rs
index c068a1834..c068a1834 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.rs
+++ b/tests/ui/did_you_mean/issue-38147-1.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-1.stderr b/tests/ui/did_you_mean/issue-38147-1.stderr
index dd193458b..74fb1c2ec 100644
--- a/src/test/ui/did_you_mean/issue-38147-1.stderr
+++ b/tests/ui/did_you_mean/issue-38147-1.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-1.rs:17:9
    |
-LL |     fn f(&self) {
-   |          ----- help: consider changing this to be a mutable reference: `&mut self`
 LL |         self.s.push('x');
    |         ^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn f(&mut self) {
+   |          ~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/issue-38147-2.rs b/tests/ui/did_you_mean/issue-38147-2.rs
index 154b149b7..154b149b7 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.rs
+++ b/tests/ui/did_you_mean/issue-38147-2.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-2.stderr b/tests/ui/did_you_mean/issue-38147-2.stderr
index 7c287a7db..7c287a7db 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.stderr
+++ b/tests/ui/did_you_mean/issue-38147-2.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-3.rs b/tests/ui/did_you_mean/issue-38147-3.rs
index 40b8e0dba..40b8e0dba 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.rs
+++ b/tests/ui/did_you_mean/issue-38147-3.rs
diff --git a/src/test/ui/did_you_mean/issue-38147-3.stderr b/tests/ui/did_you_mean/issue-38147-3.stderr
index 94ffe17f1..94ffe17f1 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.stderr
+++ b/tests/ui/did_you_mean/issue-38147-3.stderr
diff --git a/src/test/ui/did_you_mean/issue-38147-4.rs b/tests/ui/did_you_mean/issue-38147-4.rs
index e2028a9e6..e2028a9e6 100644
--- a/src/test/ui/did_you_mean/issue-38147-4.rs
+++ b/tests/ui/did_you_mean/issue-38147-4.rs
diff --git a/tests/ui/did_you_mean/issue-38147-4.stderr b/tests/ui/did_you_mean/issue-38147-4.stderr
new file mode 100644
index 000000000..d33399893
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-38147-4.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*f.s` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-38147-4.rs:6:5
+   |
+LL |     f.s.push('x');
+   |     ^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn f(x: usize, f: &mut Foo<'_>) {
+   |                   ~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-39544.rs b/tests/ui/did_you_mean/issue-39544.rs
index a19d3f704..a19d3f704 100644
--- a/src/test/ui/did_you_mean/issue-39544.rs
+++ b/tests/ui/did_you_mean/issue-39544.rs
diff --git a/tests/ui/did_you_mean/issue-39544.stderr b/tests/ui/did_you_mean/issue-39544.stderr
new file mode 100644
index 000000000..8dc0512a9
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-39544.stderr
@@ -0,0 +1,131 @@
+error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable
+  --> $DIR/issue-39544.rs:11:13
+   |
+LL |     let _ = &mut z.x;
+   |             ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut z = Z { x: X::Y };
+   |         +++
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:16:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo<'z>(&'z mut self) {
+   |                ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:20:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo1(&mut self, other: &Z) {
+   |             ~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:21:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo1(&self, other: &mut Z) {
+   |                           ~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:25:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo2<'a>(&'a mut self, other: &Z) {
+   |                 ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:26:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo2<'a>(&'a self, other: &mut Z) {
+   |                                  ~~~~~~
+
+error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:30:17
+   |
+LL |         let _ = &mut self.x;
+   |                 ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo3<'a>(self: &'a mut Self, other: &Z) {
+   |                       ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:31:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo3<'a>(self: &'a Self, other: &mut Z) {
+   |                                        ~~~~~~
+
+error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:35:17
+   |
+LL |         let _ = &mut other.x;
+   |                 ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo4(other: &mut Z) {
+   |                    ~~~~~~
+
+error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable
+  --> $DIR/issue-39544.rs:41:13
+   |
+LL |     let _ = &mut z.x;
+   |             ^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | pub fn with_arg(mut z: Z, w: &Z) {
+   |                 +++
+
+error[E0596]: cannot borrow `w.x` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-39544.rs:42:13
+   |
+LL |     let _ = &mut w.x;
+   |             ^^^^^^^^ `w` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | pub fn with_arg(z: Z, w: &mut Z) {
+   |                          ~~~~~~
+
+error[E0594]: cannot assign to `*x.0`, which is behind a `&` reference
+  --> $DIR/issue-39544.rs:48:5
+   |
+LL |     *x.0 = 1;
+   |     ^^^^^^^^ cannot assign
+
+error: aborting due to 12 previous errors
+
+Some errors have detailed explanations: E0594, E0596.
+For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
index 63a8c547c..63a8c547c 100644
--- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
+++ b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.rs
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
index 7229b9ac9..7229b9ac9 100644
--- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
+++ b/tests/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
diff --git a/src/test/ui/did_you_mean/issue-40006.rs b/tests/ui/did_you_mean/issue-40006.rs
index 74f304d81..74f304d81 100644
--- a/src/test/ui/did_you_mean/issue-40006.rs
+++ b/tests/ui/did_you_mean/issue-40006.rs
diff --git a/src/test/ui/did_you_mean/issue-40006.stderr b/tests/ui/did_you_mean/issue-40006.stderr
index bdbfa4dd7..bdbfa4dd7 100644
--- a/src/test/ui/did_you_mean/issue-40006.stderr
+++ b/tests/ui/did_you_mean/issue-40006.stderr
diff --git a/src/test/ui/did_you_mean/issue-40396.rs b/tests/ui/did_you_mean/issue-40396.rs
index 5497ba2e1..5497ba2e1 100644
--- a/src/test/ui/did_you_mean/issue-40396.rs
+++ b/tests/ui/did_you_mean/issue-40396.rs
diff --git a/src/test/ui/did_you_mean/issue-40396.stderr b/tests/ui/did_you_mean/issue-40396.stderr
index d0249efd0..d0249efd0 100644
--- a/src/test/ui/did_you_mean/issue-40396.stderr
+++ b/tests/ui/did_you_mean/issue-40396.stderr
diff --git a/src/test/ui/did_you_mean/issue-40823.rs b/tests/ui/did_you_mean/issue-40823.rs
index 0f8c74554..0f8c74554 100644
--- a/src/test/ui/did_you_mean/issue-40823.rs
+++ b/tests/ui/did_you_mean/issue-40823.rs
diff --git a/tests/ui/did_you_mean/issue-40823.stderr b/tests/ui/did_you_mean/issue-40823.stderr
new file mode 100644
index 000000000..aadd69889
--- /dev/null
+++ b/tests/ui/did_you_mean/issue-40823.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*buf` as mutable, as it is behind a `&` reference
+  --> $DIR/issue-40823.rs:3:5
+   |
+LL |     buf.iter_mut();
+   |     ^^^^^^^^^^^^^^ `buf` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let mut buf = &mut [1, 2, 3, 4];
+   |                   ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
index e566ed488..e566ed488 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
index 1708a8050..1708a8050 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
index 2a3242abe..2a3242abe 100644
--- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
+++ b/tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs b/tests/ui/did_you_mean/issue-42599_available_fields_note.rs
index c377dfc12..c377dfc12 100644
--- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs
+++ b/tests/ui/did_you_mean/issue-42599_available_fields_note.rs
diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr b/tests/ui/did_you_mean/issue-42599_available_fields_note.stderr
index dbd9dc1bc..dbd9dc1bc 100644
--- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr
+++ b/tests/ui/did_you_mean/issue-42599_available_fields_note.stderr
diff --git a/src/test/ui/did_you_mean/issue-42764.rs b/tests/ui/did_you_mean/issue-42764.rs
index eb96c2480..eb96c2480 100644
--- a/src/test/ui/did_you_mean/issue-42764.rs
+++ b/tests/ui/did_you_mean/issue-42764.rs
diff --git a/src/test/ui/did_you_mean/issue-42764.stderr b/tests/ui/did_you_mean/issue-42764.stderr
index 6a7fd8fe2..6a7fd8fe2 100644
--- a/src/test/ui/did_you_mean/issue-42764.stderr
+++ b/tests/ui/did_you_mean/issue-42764.stderr
diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
index 9602d2746..9602d2746 100644
--- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
+++ b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs
diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
index 9dde5b3eb..9dde5b3eb 100644
--- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
+++ b/tests/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr
diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
index 63e8b2ba0..63e8b2ba0 100644
--- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
+++ b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs
diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
index bfe1ed328..bfe1ed328 100644
--- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
+++ b/tests/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr
diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
index df697ccb6..df697ccb6 100644
--- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
+++ b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs
diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
index 14918ba89..14918ba89 100644
--- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
+++ b/tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
index 43b5f6d54..43b5f6d54 100644
--- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
+++ b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs
diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
index a3c607b59..a3c607b59 100644
--- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
+++ b/tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
index 66d562d2e..66d562d2e 100644
--- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
+++ b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs
diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
index 81f3f2694..81f3f2694 100644
--- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
+++ b/tests/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
index 73f1856ca..73f1856ca 100644
--- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
+++ b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs
diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
index 6f853ccab..6f853ccab 100644
--- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
+++ b/tests/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
index 44421b077..44421b077 100644
--- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
+++ b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
index cbe59e8e0..cbe59e8e0 100644
--- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
+++ b/tests/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.fixed b/tests/ui/did_you_mean/issue-54109-without-witness.fixed
index 5079a37f4..5079a37f4 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.fixed
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.fixed
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.rs b/tests/ui/did_you_mean/issue-54109-without-witness.rs
index 00660a938..00660a938 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.rs
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.rs
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr b/tests/ui/did_you_mean/issue-54109-without-witness.stderr
index 6455b0863..6455b0863 100644
--- a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr
+++ b/tests/ui/did_you_mean/issue-54109-without-witness.stderr
diff --git a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
index 264cfa449..264cfa449 100644
--- a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
+++ b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs
diff --git a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
index abc040c05..abc040c05 100644
--- a/src/test/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
+++ b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
diff --git a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
index 070ffaa1e..070ffaa1e 100644
--- a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
+++ b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs
diff --git a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
index d5ad1a72b..d5ad1a72b 100644
--- a/src/test/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
+++ b/tests/ui/did_you_mean/issue-87830-try-brackets-for-arrays.stderr
diff --git a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
index 0efc7daa3..0efc7daa3 100644
--- a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
+++ b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
diff --git a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
index 784986d3b..784986d3b 100644
--- a/src/test/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
+++ b/tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.stderr
diff --git a/src/test/ui/did_you_mean/pub-macro-rules.rs b/tests/ui/did_you_mean/pub-macro-rules.rs
index c5393703f..c5393703f 100644
--- a/src/test/ui/did_you_mean/pub-macro-rules.rs
+++ b/tests/ui/did_you_mean/pub-macro-rules.rs
diff --git a/src/test/ui/did_you_mean/pub-macro-rules.stderr b/tests/ui/did_you_mean/pub-macro-rules.stderr
index 0bde5783b..0bde5783b 100644
--- a/src/test/ui/did_you_mean/pub-macro-rules.stderr
+++ b/tests/ui/did_you_mean/pub-macro-rules.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit.rs b/tests/ui/did_you_mean/recursion_limit.rs
index 38db12960..38db12960 100644
--- a/src/test/ui/did_you_mean/recursion_limit.rs
+++ b/tests/ui/did_you_mean/recursion_limit.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit.stderr b/tests/ui/did_you_mean/recursion_limit.stderr
index 247fe4b5b..247fe4b5b 100644
--- a/src/test/ui/did_you_mean/recursion_limit.stderr
+++ b/tests/ui/did_you_mean/recursion_limit.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.rs b/tests/ui/did_you_mean/recursion_limit_deref.rs
index 41bbca661..41bbca661 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.rs
+++ b/tests/ui/did_you_mean/recursion_limit_deref.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.stderr b/tests/ui/did_you_mean/recursion_limit_deref.stderr
index a6b5681a6..a6b5681a6 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.stderr
+++ b/tests/ui/did_you_mean/recursion_limit_deref.stderr
diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.rs b/tests/ui/did_you_mean/recursion_limit_macro.rs
index a68a5ece7..a68a5ece7 100644
--- a/src/test/ui/did_you_mean/recursion_limit_macro.rs
+++ b/tests/ui/did_you_mean/recursion_limit_macro.rs
diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.stderr b/tests/ui/did_you_mean/recursion_limit_macro.stderr
index 71855cf1e..71855cf1e 100644
--- a/src/test/ui/did_you_mean/recursion_limit_macro.stderr
+++ b/tests/ui/did_you_mean/recursion_limit_macro.stderr
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
index 4963790c3..4963790c3 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.fixed
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
index ddf39c9c8..ddf39c9c8 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.rs
diff --git a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
index 730836a40..730836a40 100644
--- a/src/test/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
+++ b/tests/ui/did_you_mean/replace-impl-infer-ty-from-trait.stderr
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
index c9a097d36..c9a097d36 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
+++ b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
index 68734cd4c..68734cd4c 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
+++ b/tests/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.fixed b/tests/ui/did_you_mean/use_instead_of_import.fixed
index a8aae76f4..a8aae76f4 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.fixed
+++ b/tests/ui/did_you_mean/use_instead_of_import.fixed
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.rs b/tests/ui/did_you_mean/use_instead_of_import.rs
index 2db7c2407..2db7c2407 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.rs
+++ b/tests/ui/did_you_mean/use_instead_of_import.rs
diff --git a/src/test/ui/did_you_mean/use_instead_of_import.stderr b/tests/ui/did_you_mean/use_instead_of_import.stderr
index 2aac8f68c..2aac8f68c 100644
--- a/src/test/ui/did_you_mean/use_instead_of_import.stderr
+++ b/tests/ui/did_you_mean/use_instead_of_import.stderr