even --bless causes bug

AndyJado · AndyJado · commit 78ed126814dc · 2023-10-17T10:37:31.000+08:00
diff --git a/tests/ui/array-slice-vec/slice-mut-2.stderr b/tests/ui/array-slice-vec/slice-mut-2.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/slice-mut-2.rs:7:18
    |
 LL |     let _ = &mut x[2..4];
diff --git a/tests/ui/borrowck/borrow-immutable-upvar-mutation.stderr b/tests/ui/borrowck/borrow-immutable-upvar-mutation.stderr
@@ -10,7 +10,7 @@ LL |         let _f = to_fn(|| x = 42);
    |                  |     in this closure
    |                  expects `Fn` instead of `FnMut`
 
-error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow y as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-immutable-upvar-mutation.rs:24:31
    |
 LL | fn to_fn<A: std::marker::Tuple, F: Fn<A>>(f: F) -> F {
@@ -46,7 +46,7 @@ LL |         let _f = to_fn(move || x = 42);
    |                  |     in this closure
    |                  expects `Fn` instead of `FnMut`
 
-error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow y as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-immutable-upvar-mutation.rs:39:36
    |
 LL | fn to_fn<A: std::marker::Tuple, F: Fn<A>>(f: F) -> F {
diff --git a/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr b/tests/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrow-raw-address-of-deref-mutability.rs:8:13
    |
 LL |     let q = &raw mut *x;
diff --git a/tests/ui/borrowck/borrow-raw-address-of-mutability.stderr b/tests/ui/borrowck/borrow-raw-address-of-mutability.stderr
@@ -32,7 +32,7 @@ help: consider changing this to be mutable
 LL |     let mut f = || {
    |         +++
 
-error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow x as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-raw-address-of-mutability.rs:29:17
    |
 LL | fn make_fn<F: Fn()>(f: F) -> F { f }
@@ -45,7 +45,7 @@ LL |     let f = make_fn(|| {
 LL |         let y = &raw mut x;
    |                 ^^^^^^^^^^ cannot borrow as mutable
 
-error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow x as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-raw-address-of-mutability.rs:37:17
    |
 LL | fn make_fn<F: Fn()>(f: F) -> F { f }
diff --git a/tests/ui/borrowck/borrowck-access-permissions.stderr b/tests/ui/borrowck/borrowck-access-permissions.stderr
@@ -26,7 +26,7 @@ help: consider changing this to be mutable
 LL |         let mut box_x = Box::new(1);
    |             +++
 
-error[E0596]: cannot borrow `*ref_x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *ref_x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-access-permissions.rs:30:19
    |
 LL |         let _y1 = &mut *ref_x;
@@ -48,7 +48,7 @@ help: consider changing this to be a mutable pointer
 LL |         let ptr_x : *const _ = &mut x;
    |                                 +++
 
-error[E0596]: cannot borrow `*foo_ref.f` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *foo_ref.f as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-access-permissions.rs:48:18
    |
 LL |         let _y = &mut *foo_ref.f;
diff --git a/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr b/tests/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr
@@ -19,7 +19,7 @@ LL |     let p: &isize = &**t0;
 LL |     **t1 = 22;
    |     --------- mutable borrow later used here
 
-error[E0596]: cannot borrow `**t0` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow **t0 as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:26
    |
 LL |     let x:  &mut isize = &mut **t0;
diff --git a/tests/ui/borrowck/borrowck-closures-mut-of-imm.stderr b/tests/ui/borrowck/borrowck-closures-mut-of-imm.stderr
@@ -1,10 +1,10 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-closures-mut-of-imm.rs:9:25
    |
 LL |     let mut c1 = || set(&mut *x);
    |                         ^^^^^^^ cannot borrow as mutable
 
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-closures-mut-of-imm.rs:11:25
    |
 LL |     let mut c2 = || set(&mut *x);
diff --git a/tests/ui/borrowck/borrowck-reborrow-from-mut.stderr b/tests/ui/borrowck/borrowck-reborrow-from-mut.stderr
@@ -102,7 +102,7 @@ LL |     let _foo2 = &mut *foo;
 LL |     use_imm(_bar1);
    |             ----- immutable borrow later used here
 
-error[E0596]: cannot borrow `foo.bar1` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow foo.bar1 as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-reborrow-from-mut.rs:88:17
    |
 LL |     let _bar1 = &mut foo.bar1;
diff --git a/tests/ui/borrowck/issue-115259-suggest-iter-mut.stderr b/tests/ui/borrowck/issue-115259-suggest-iter-mut.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `**layer` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow **layer as mutable, as it is behind a `&` reference
   --> $DIR/issue-115259-suggest-iter-mut.rs:15:65
    |
 LL |         self.layers.iter().fold(0, |result, mut layer| result + layer.process())
diff --git a/tests/ui/borrowck/issue-62387-suggest-iter-mut-2.stderr b/tests/ui/borrowck/issue-62387-suggest-iter-mut-2.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*container` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *container as mutable, as it is behind a `&` reference
   --> $DIR/issue-62387-suggest-iter-mut-2.rs:30:45
    |
 LL |             vec.iter().flat_map(|container| container.things()).cloned().collect::<Vec<PathBuf>>();
diff --git a/tests/ui/borrowck/issue-62387-suggest-iter-mut.stderr b/tests/ui/borrowck/issue-62387-suggest-iter-mut.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *a as mutable, as it is behind a `&` reference
   --> $DIR/issue-62387-suggest-iter-mut.rs:18:27
    |
 LL |     v.iter().for_each(|a| a.double());
@@ -11,7 +11,7 @@ help: you may want to use `iter_mut` here
 LL |     v.iter_mut().for_each(|a| a.double());
    |       ~~~~~~~~
 
-error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *a as mutable, as it is behind a `&` reference
   --> $DIR/issue-62387-suggest-iter-mut.rs:25:39
    |
 LL |     v.iter().rev().rev().for_each(|a| a.double());
diff --git a/tests/ui/borrowck/issue-82032.stderr b/tests/ui/borrowck/issue-82032.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*v` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *v as mutable, as it is behind a `&` reference
   --> $DIR/issue-82032.rs:10:13
    |
 LL |         for v in self.0.values() {
diff --git a/tests/ui/borrowck/issue-85765-closure.stderr b/tests/ui/borrowck/issue-85765-closure.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*rofl` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *rofl as mutable, as it is behind a `&` reference
   --> $DIR/issue-85765-closure.rs:6:9
    |
 LL |         rofl.push(Vec::new());
diff --git a/tests/ui/borrowck/issue-85765.stderr b/tests/ui/borrowck/issue-85765.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*rofl` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *rofl as mutable, as it is behind a `&` reference
   --> $DIR/issue-85765.rs:5:5
    |
 LL |     rofl.push(Vec::new());
diff --git a/tests/ui/borrowck/issue-91206.stderr b/tests/ui/borrowck/issue-91206.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*inner` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *inner as mutable, as it is behind a `&` reference
   --> $DIR/issue-91206.rs:13:5
    |
 LL |     inner.clear();
diff --git a/tests/ui/borrowck/mutability-errors.stderr b/tests/ui/borrowck/mutability-errors.stderr
@@ -20,7 +20,7 @@ help: consider changing this to be a mutable reference
 LL | fn named_ref(x: &mut (i32,)) {
    |                  +++
 
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/mutability-errors.rs:11:5
    |
 LL |     &mut *x;
@@ -31,7 +31,7 @@ help: consider changing this to be a mutable reference
 LL | fn named_ref(x: &mut (i32,)) {
    |                  +++
 
-error[E0596]: cannot borrow `x.0` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow x.0 as mutable, as it is behind a `&` reference
   --> $DIR/mutability-errors.rs:12:5
    |
 LL |     &mut x.0;
@@ -161,7 +161,7 @@ LL |         x = (1,);
 LL |         x.0 = 1;
    |         ^^^^^^^ cannot assign
 
-error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow x as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:42:9
    |
 LL | fn fn_ref<F: Fn()>(f: F) -> F { f }
@@ -216,7 +216,7 @@ LL |         x = (1,);
 LL |         x.0 = 1;
    |         ^^^^^^^ cannot assign
 
-error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow x as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:48:9
    |
 LL | fn fn_ref<F: Fn()>(f: F) -> F { f }
diff --git a/tests/ui/borrowck/suggest-as-ref-on-mut-closure.stderr b/tests/ui/borrowck/suggest-as-ref-on-mut-closure.stderr
@@ -10,7 +10,7 @@ LL |     cb.map(|cb| cb());
 note: `Option::<T>::map` takes ownership of the receiver `self`, which moves `*cb`
   --> $SRC_DIR/core/src/option.rs:LL:COL
 
-error[E0596]: cannot borrow `*cb` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *cb as mutable, as it is behind a `&` reference
   --> $DIR/suggest-as-ref-on-mut-closure.rs:12:26
    |
 LL |     cb.as_ref().map(|cb| cb());
diff --git a/tests/ui/borrowck/suggest-mut-iterator.stderr b/tests/ui/borrowck/suggest-mut-iterator.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*test` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *test as mutable, as it is behind a `&` reference
   --> $DIR/suggest-mut-iterator.rs:22:9
    |
 LL |     for test in &tests {
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-109141.stderr b/tests/ui/const-generics/generic_const_exprs/issue-109141.stderr
@@ -9,7 +9,7 @@ help: you might be missing a const parameter
 LL | struct EntriesBuffer<const HashesEntryLEN: /* Type */>(Box<[[u8; HashesEntryLEN]; 5]>);
    |                     ++++++++++++++++++++++++++++++++++
 
-error[E0596]: cannot borrow `*self.0` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *self.0 as mutable, as it is behind a `&` reference
   --> $DIR/issue-109141.rs:6:9
    |
 LL |         self.0.iter_mut()
diff --git a/tests/ui/did_you_mean/issue-38147-1.stderr b/tests/ui/did_you_mean/issue-38147-1.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *self.s as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-1.rs:17:9
    |
 LL |         self.s.push('x');
diff --git a/tests/ui/did_you_mean/issue-38147-2.stderr b/tests/ui/did_you_mean/issue-38147-2.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *self.s as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-2.rs:9:9
    |
 LL |         self.s.push('x');
@@ -9,7 +9,7 @@ help: consider changing this to be mutable
 LL |     s: &'a mut String,
    |            +++
 
-error[E0596]: cannot borrow `*self.longer_name` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *self.longer_name as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-2.rs:12:9
    |
 LL |         self.longer_name.push(13);
diff --git a/tests/ui/did_you_mean/issue-38147-3.stderr b/tests/ui/did_you_mean/issue-38147-3.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *self.s as mutable, as it is behind a `&` reference
   --> $DIR/issue-38147-3.rs:7:9
    |
 LL |         self.s.push('x');
diff --git a/tests/ui/did_you_mean/issue-38147-4.stderr b/tests/ui/did_you_mean/issue-38147-4.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*f.s` as mutable, as it is behind a `&` reference
+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');
diff --git a/tests/ui/did_you_mean/issue-39544.stderr b/tests/ui/did_you_mean/issue-39544.stderr
@@ -9,7 +9,7 @@ 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
+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;
@@ -20,7 +20,7 @@ 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
+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;
@@ -31,7 +31,7 @@ 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
+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;
@@ -42,7 +42,7 @@ 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
+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;
@@ -53,7 +53,7 @@ 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
+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;
@@ -64,7 +64,7 @@ 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
+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;
@@ -75,7 +75,7 @@ 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
+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;
@@ -86,7 +86,7 @@ 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
+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;
@@ -108,7 +108,7 @@ 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
+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;
diff --git a/tests/ui/did_you_mean/issue-40823.stderr b/tests/ui/did_you_mean/issue-40823.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*buf` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *buf as mutable, as it is behind a `&` reference
   --> $DIR/issue-40823.rs:3:5
    |
 LL |     buf.iter_mut();
diff --git a/tests/ui/issues/issue-21600.stderr b/tests/ui/issues/issue-21600.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
+error[E0596]: cannot borrow x as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/issue-21600.rs:14:20
    |
 LL | fn call_it<F>(f: F) where F: Fn() { f(); }
diff --git a/tests/ui/issues/issue-61623.stderr b/tests/ui/issues/issue-61623.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x.1` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x.1 as mutable, as it is behind a `&` reference
   --> $DIR/issue-61623.rs:6:19
    |
 LL |     f2(|| x.0, f1(x.1))
diff --git a/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
@@ -9,7 +9,7 @@ help: consider changing this to be mutable
 LL | fn deref_mut1(mut x: Own<isize>) {
    |               +++
 
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:41:11
    |
 LL |     &mut **x
@@ -31,7 +31,7 @@ help: consider changing this to be mutable
 LL | fn assign1<'a>(mut x: Own<isize>) {
    |                +++
 
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:53:6
    |
 LL |     **x = 3;
diff --git a/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -10,7 +10,7 @@ LL |
 LL |         f((Box::new(|| {})))
    |         - second borrow occurs due to use of `f` in closure
 
-error[E0596]: cannot borrow `*f` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *f as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:25:5
    |
 LL |     (*f)();
@@ -21,7 +21,7 @@ help: consider changing this to be a mutable reference
 LL | fn test2<F>(f: &mut F) where F: FnMut() {
    |                 +++
 
-error[E0596]: cannot borrow `f.f` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow f.f as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:34:5
    |
 LL |     f.f.call_mut(())
diff --git a/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-method-from-mut-aliasable.rs:17:5
    |
 LL |     x.h();
diff --git a/tests/ui/span/borrowck-fn-in-const-b.stderr b/tests/ui/span/borrowck-fn-in-const-b.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-fn-in-const-b.rs:7:9
    |
 LL |         x.push(format!("this is broken"));
diff --git a/tests/ui/span/borrowck-object-mutability.stderr b/tests/ui/span/borrowck-object-mutability.stderr
@@ -1,4 +1,4 @@
-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-object-mutability.rs:8:5
    |
 LL |     x.borrowed_mut();
diff --git a/tests/ui/span/mut-arg-hint.stderr b/tests/ui/span/mut-arg-hint.stderr
diff --git a/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr b/tests/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
	`1`	+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
`2`	`2`	`--> $DIR/slice-mut-2.rs:7:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _ = &mut x[2..4];`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ LL \| let p: &isize = &**t0;`
`19`	`19`	`LL \| **t1 = 22;`
`20`	`20`	`\| --------- mutable borrow later used here`
`21`	`21`
`22`		-error[E0596]: cannot borrow `**t0` as mutable, as it is behind a `&` reference
	`22`	+error[E0596]: cannot borrow **t0 as mutable, as it is behind a `&` reference
`23`	`23`	`--> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:26`
`24`	`24`	`\|`
`25`	`25`	`LL \| let x: &mut isize = &mut **t0;`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
	`1`	+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
`2`	`2`	`--> $DIR/borrowck-closures-mut-of-imm.rs:9:25`
`3`	`3`	`\|`
`4`	`4`	`LL \| let mut c1 = \|\| set(&mut *x);`
`5`	`5`	`\| ^^^^^^^ cannot borrow as mutable`
`6`	`6`
`7`		-error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
	`7`	+error[E0596]: cannot borrow *x as mutable, as it is behind a `&` reference
`8`	`8`	`--> $DIR/borrowck-closures-mut-of-imm.rs:11:25`
`9`	`9`	`\|`
`10`	`10`	`LL \| let mut c2 = \|\| set(&mut *x);`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ LL \| let _foo2 = &mut *foo;`
`102`	`102`	`LL \| use_imm(_bar1);`
`103`	`103`	`\| ----- immutable borrow later used here`
`104`	`104`
`105`		-error[E0596]: cannot borrow `foo.bar1` as mutable, as it is behind a `&` reference
	`105`	+error[E0596]: cannot borrow foo.bar1 as mutable, as it is behind a `&` reference
`106`	`106`	`--> $DIR/borrowck-reborrow-from-mut.rs:88:17`
`107`	`107`	`\|`
`108`	`108`	`LL \| let _bar1 = &mut foo.bar1;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0596]: cannot borrow `**layer` as mutable, as it is behind a `&` reference
	`1`	+error[E0596]: cannot borrow **layer as mutable, as it is behind a `&` reference
`2`	`2`	`--> $DIR/issue-115259-suggest-iter-mut.rs:15:65`
`3`	`3`	`\|`
`4`	`4`	`LL \| self.layers.iter().fold(0, \|result, mut layer\| result + layer.process())`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0596]: cannot borrow `*container` as mutable, as it is behind a `&` reference
	`1`	+error[E0596]: cannot borrow *container as mutable, as it is behind a `&` reference
`2`	`2`	`--> $DIR/issue-62387-suggest-iter-mut-2.rs:30:45`
`3`	`3`	`\|`
`4`	`4`	`LL \| vec.iter().flat_map(\|container\| container.things()).cloned().collect::<Vec<PathBuf>>();`