Fix span for &mut removal suggestion

estebank · estebank · commit b8bd1d0826b8 · 2022-12-13T10:06:14.000-08:00
diff --git a/compiler/rustc_borrowck/src/diagnostics/move_errors.rs b/compiler/rustc_borrowck/src/diagnostics/move_errors.rs
@@ -481,6 +481,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 let (pat_span, suggestion, to_remove) = if inner_pat_snippet.starts_with("mut")
                     && inner_pat_snippet["mut".len()..].starts_with(rustc_lexer::is_whitespace)
                 {
+                    let inner_pat_snippet = inner_pat_snippet["mut".len()..].trim_start();
                     let pat_span = pat_span.with_hi(
                         pat_span.lo()
                             + BytePos((pat_snippet.len() - inner_pat_snippet.len()) as u32),
diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr
@@ -37,7 +37,7 @@ LL |         &mut [_a,
 help: consider removing the mutable borrow
    |
 LL -         &mut [_a,
-LL +         mut [_a,
+LL +         [_a,
    |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
@@ -69,7 +69,7 @@ LL |          _b] => {}
 help: consider removing the mutable borrow
    |
 LL -         &mut [
-LL +         mut [
+LL +         [
    |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
@@ -102,7 +102,7 @@ LL |         &mut [_a, _b, _c] => {}
 help: consider removing the mutable borrow
    |
 LL -         &mut [_a, _b, _c] => {}
-LL +         mut [_a, _b, _c] => {}
+LL +         [_a, _b, _c] => {}
    |
 
 error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
diff --git a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
@@ -139,7 +139,7 @@ LL |     let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
 help: consider removing the mutable borrow
    |
 LL -     let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
-LL +     let mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
+LL +     let (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -155,7 +155,7 @@ LL |     if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.c
 help: consider removing the mutable borrow
    |
 LL -     if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
-LL +     if let mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+LL +     if let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -171,7 +171,7 @@ LL |     while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), e
 help: consider removing the mutable borrow
    |
 LL -     while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
-LL +     while let mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
+LL +     while let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -192,12 +192,12 @@ LL |         &mut (Either::Two(_t), Either::One(_u)) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
-LL +         mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
    |
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::Two(_t), Either::One(_u)) => (),
-LL +         mut (Either::Two(_t), Either::One(_u)) => (),
+LL +         (Either::Two(_t), Either::One(_u)) => (),
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -215,7 +215,7 @@ LL |         &mut (Either::One(_t), Either::Two(_u))
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::One(_t), Either::Two(_u))
-LL +         mut (Either::One(_t), Either::Two(_u))
+LL +         (Either::One(_t), Either::Two(_u))
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -233,7 +233,7 @@ LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
-LL +         mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -251,7 +251,7 @@ LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
-LL +         mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -269,7 +269,7 @@ LL |         &mut (Either::One(_t), Either::Two(_u)) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut (Either::One(_t), Either::Two(_u)) => (),
-LL +         mut (Either::One(_t), Either::Two(_u)) => (),
+LL +         (Either::One(_t), Either::Two(_u)) => (),
    |
 
 error[E0507]: cannot move out of a shared reference
@@ -301,7 +301,7 @@ LL |     fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }
 help: consider removing the mutable borrow
    |
 LL -     fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }
-LL +     fn f6(mut (X(_t), X(_u)): &mut (X, X)) { }
+LL +     fn f6((X(_t), X(_u)): &mut (X, X)) { }
    |
 
 error: aborting due to 17 previous errors
diff --git a/src/test/ui/suggestions/dont-suggest-ref/simple.stderr b/src/test/ui/suggestions/dont-suggest-ref/simple.stderr
@@ -447,7 +447,7 @@ LL |     let &mut X(_t) = sm;
 help: consider removing the mutable borrow
    |
 LL -     let &mut X(_t) = sm;
-LL +     let mut X(_t) = sm;
+LL +     let X(_t) = sm;
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
@@ -462,7 +462,7 @@ LL |     if let &mut Either::One(_t) = rm { }
 help: consider removing the mutable borrow
    |
 LL -     if let &mut Either::One(_t) = rm { }
-LL +     if let mut Either::One(_t) = rm { }
+LL +     if let Either::One(_t) = rm { }
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
@@ -477,7 +477,7 @@ LL |     while let &mut Either::One(_t) = rm { }
 help: consider removing the mutable borrow
    |
 LL -     while let &mut Either::One(_t) = rm { }
-LL +     while let mut Either::One(_t) = rm { }
+LL +     while let Either::One(_t) = rm { }
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `Two` which is behind a mutable reference
@@ -496,12 +496,12 @@ LL |         &mut Either::Two(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::Two(_t) => (),
-LL +         mut Either::Two(_t) => (),
+LL +         Either::Two(_t) => (),
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
@@ -519,7 +519,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
@@ -537,7 +537,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
@@ -555,7 +555,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of a shared reference
@@ -792,7 +792,7 @@ LL |     let &mut X(_t) = &mut xm;
 help: consider removing the mutable borrow
    |
 LL -     let &mut X(_t) = &mut xm;
-LL +     let mut X(_t) = &mut xm;
+LL +     let X(_t) = &mut xm;
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -807,7 +807,7 @@ LL |     if let &mut Either::One(_t) = &mut em { }
 help: consider removing the mutable borrow
    |
 LL -     if let &mut Either::One(_t) = &mut em { }
-LL +     if let mut Either::One(_t) = &mut em { }
+LL +     if let Either::One(_t) = &mut em { }
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -822,7 +822,7 @@ LL |     while let &mut Either::One(_t) = &mut em { }
 help: consider removing the mutable borrow
    |
 LL -     while let &mut Either::One(_t) = &mut em { }
-LL +     while let mut Either::One(_t) = &mut em { }
+LL +     while let Either::One(_t) = &mut em { }
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -840,7 +840,7 @@ LL |         &mut Either::One(_t)
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t)
-LL +         mut Either::One(_t)
+LL +         Either::One(_t)
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -858,7 +858,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -876,7 +876,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of a mutable reference
@@ -894,7 +894,7 @@ LL |         &mut Either::One(_t) => (),
 help: consider removing the mutable borrow
    |
 LL -         &mut Either::One(_t) => (),
-LL +         mut Either::One(_t) => (),
+LL +         Either::One(_t) => (),
    |
 
 error[E0507]: cannot move out of a shared reference
@@ -924,7 +924,7 @@ LL |     fn f2(&mut X(_t): &mut X) { }
 help: consider removing the mutable borrow
    |
 LL -     fn f2(&mut X(_t): &mut X) { }
-LL +     fn f2(mut X(_t): &mut X) { }
+LL +     fn f2(X(_t): &mut X) { }
    |
 
 error[E0507]: cannot move out of a shared reference

Original file line number	Diff line number	Diff line change
`@@ -481,6 +481,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {`
`481`	`481`	`let (pat_span, suggestion, to_remove) = if inner_pat_snippet.starts_with("mut")`
`482`	`482`	`&& inner_pat_snippet["mut".len()..].starts_with(rustc_lexer::is_whitespace)`
`483`	`483`	`{`
	`484`	`+ let inner_pat_snippet = inner_pat_snippet["mut".len()..].trim_start();`
`484`	`485`	`let pat_span = pat_span.with_hi(`
`485`	`486`	`pat_span.lo()`
`486`	`487`	`+ BytePos((pat_snippet.len() - inner_pat_snippet.len()) as u32),`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ LL \| &mut [_a,`
`37`	`37`	`help: consider removing the mutable borrow`
`38`	`38`	`\|`
`39`	`39`	`LL - &mut [_a,`
`40`		`-LL + mut [_a,`
	`40`	`+LL + [_a,`
`41`	`41`	`\|`
`42`	`42`
`43`	`43`	error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
`@@ -69,7 +69,7 @@ LL \| _b] => {}`
`69`	`69`	`help: consider removing the mutable borrow`
`70`	`70`	`\|`
`71`	`71`	`LL - &mut [`
`72`		`-LL + mut [`
	`72`	`+LL + [`
`73`	`73`	`\|`
`74`	`74`
`75`	`75`	error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
`@@ -102,7 +102,7 @@ LL \| &mut [_a, _b, _c] => {}`
`102`	`102`	`help: consider removing the mutable borrow`
`103`	`103`	`\|`
`104`	`104`	`LL - &mut [_a, _b, _c] => {}`
`105`		`-LL + mut [_a, _b, _c] => {}`
	`105`	`+LL + [_a, _b, _c] => {}`
`106`	`106`	`\|`
`107`	`107`
`108`	`108`	error[E0508]: cannot move out of type `[Box<isize>]`, a non-copy slice
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ LL \| let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());`
`139`	`139`	`help: consider removing the mutable borrow`
`140`	`140`	`\|`
`141`	`141`	`LL - let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());`
`142`		`-LL + let mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());`
	`142`	`+LL + let (X(_t), X(_u)) = &mut (xm.clone(), xm.clone());`
`143`	`143`	`\|`
`144`	`144`
`145`	`145`	`error[E0507]: cannot move out of a mutable reference`
`@@ -155,7 +155,7 @@ LL \| if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.c`
`155`	`155`	`help: consider removing the mutable borrow`
`156`	`156`	`\|`
`157`	`157`	`LL - if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
`158`		`-LL + if let mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
	`158`	`+LL + if let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
`159`	`159`	`\|`
`160`	`160`
`161`	`161`	`error[E0507]: cannot move out of a mutable reference`
`@@ -171,7 +171,7 @@ LL \| while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), e`
`171`	`171`	`help: consider removing the mutable borrow`
`172`	`172`	`\|`
`173`	`173`	`LL - while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
`174`		`-LL + while let mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
	`174`	`+LL + while let (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { }`
`175`	`175`	`\|`
`176`	`176`
`177`	`177`	`error[E0507]: cannot move out of a mutable reference`
`@@ -192,12 +192,12 @@ LL \| &mut (Either::Two(_t), Either::One(_u)) => (),`
`192`	`192`	`help: consider removing the mutable borrow`
`193`	`193`	`\|`
`194`	`194`	`LL - &mut (Either::One(_t), Either::Two(_u)) => (),`
`195`		`-LL + mut (Either::One(_t), Either::Two(_u)) => (),`
	`195`	`+LL + (Either::One(_t), Either::Two(_u)) => (),`
`196`	`196`	`\|`
`197`	`197`	`help: consider removing the mutable borrow`
`198`	`198`	`\|`
`199`	`199`	`LL - &mut (Either::Two(_t), Either::One(_u)) => (),`
`200`		`-LL + mut (Either::Two(_t), Either::One(_u)) => (),`
	`200`	`+LL + (Either::Two(_t), Either::One(_u)) => (),`
`201`	`201`	`\|`
`202`	`202`
`203`	`203`	`error[E0507]: cannot move out of a mutable reference`
`@@ -215,7 +215,7 @@ LL \| &mut (Either::One(_t), Either::Two(_u))`
`215`	`215`	`help: consider removing the mutable borrow`
`216`	`216`	`\|`
`217`	`217`	`LL - &mut (Either::One(_t), Either::Two(_u))`
`218`		`-LL + mut (Either::One(_t), Either::Two(_u))`
	`218`	`+LL + (Either::One(_t), Either::Two(_u))`
`219`	`219`	`\|`
`220`	`220`
`221`	`221`	`error[E0507]: cannot move out of a mutable reference`
`@@ -233,7 +233,7 @@ LL \| &mut (Either::One(_t), Either::Two(_u)) => (),`
`233`	`233`	`help: consider removing the mutable borrow`
`234`	`234`	`\|`
`235`	`235`	`LL - &mut (Either::One(_t), Either::Two(_u)) => (),`
`236`		`-LL + mut (Either::One(_t), Either::Two(_u)) => (),`
	`236`	`+LL + (Either::One(_t), Either::Two(_u)) => (),`
`237`	`237`	`\|`
`238`	`238`
`239`	`239`	`error[E0507]: cannot move out of a mutable reference`
`@@ -251,7 +251,7 @@ LL \| &mut (Either::One(_t), Either::Two(_u)) => (),`
`251`	`251`	`help: consider removing the mutable borrow`
`252`	`252`	`\|`
`253`	`253`	`LL - &mut (Either::One(_t), Either::Two(_u)) => (),`
`254`		`-LL + mut (Either::One(_t), Either::Two(_u)) => (),`
	`254`	`+LL + (Either::One(_t), Either::Two(_u)) => (),`
`255`	`255`	`\|`
`256`	`256`
`257`	`257`	`error[E0507]: cannot move out of a mutable reference`
`@@ -269,7 +269,7 @@ LL \| &mut (Either::One(_t), Either::Two(_u)) => (),`
`269`	`269`	`help: consider removing the mutable borrow`
`270`	`270`	`\|`
`271`	`271`	`LL - &mut (Either::One(_t), Either::Two(_u)) => (),`
`272`		`-LL + mut (Either::One(_t), Either::Two(_u)) => (),`
	`272`	`+LL + (Either::One(_t), Either::Two(_u)) => (),`
`273`	`273`	`\|`
`274`	`274`
`275`	`275`	`error[E0507]: cannot move out of a shared reference`
`@@ -301,7 +301,7 @@ LL \| fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }`
`301`	`301`	`help: consider removing the mutable borrow`
`302`	`302`	`\|`
`303`	`303`	`LL - fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { }`
`304`		`-LL + fn f6(mut (X(_t), X(_u)): &mut (X, X)) { }`
	`304`	`+LL + fn f6((X(_t), X(_u)): &mut (X, X)) { }`
`305`	`305`	`\|`
`306`	`306`
`307`	`307`	`error: aborting due to 17 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ LL \| let &mut X(_t) = sm;`
`447`	`447`	`help: consider removing the mutable borrow`
`448`	`448`	`\|`
`449`	`449`	`LL - let &mut X(_t) = sm;`
`450`		`-LL + let mut X(_t) = sm;`
	`450`	`+LL + let X(_t) = sm;`
`451`	`451`	`\|`
`452`	`452`
`453`	`453`	error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
`@@ -462,7 +462,7 @@ LL \| if let &mut Either::One(_t) = rm { }`
`462`	`462`	`help: consider removing the mutable borrow`
`463`	`463`	`\|`
`464`	`464`	`LL - if let &mut Either::One(_t) = rm { }`
`465`		`-LL + if let mut Either::One(_t) = rm { }`
	`465`	`+LL + if let Either::One(_t) = rm { }`
`466`	`466`	`\|`
`467`	`467`
`468`	`468`	error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
`@@ -477,7 +477,7 @@ LL \| while let &mut Either::One(_t) = rm { }`
`477`	`477`	`help: consider removing the mutable borrow`
`478`	`478`	`\|`
`479`	`479`	`LL - while let &mut Either::One(_t) = rm { }`
`480`		`-LL + while let mut Either::One(_t) = rm { }`
	`480`	`+LL + while let Either::One(_t) = rm { }`
`481`	`481`	`\|`
`482`	`482`
`483`	`483`	error[E0507]: cannot move out of `rm` as enum variant `Two` which is behind a mutable reference
`@@ -496,12 +496,12 @@ LL \| &mut Either::Two(_t) => (),`
`496`	`496`	`help: consider removing the mutable borrow`
`497`	`497`	`\|`
`498`	`498`	`LL - &mut Either::One(_t) => (),`
`499`		`-LL + mut Either::One(_t) => (),`
	`499`	`+LL + Either::One(_t) => (),`
`500`	`500`	`\|`
`501`	`501`	`help: consider removing the mutable borrow`
`502`	`502`	`\|`
`503`	`503`	`LL - &mut Either::Two(_t) => (),`
`504`		`-LL + mut Either::Two(_t) => (),`
	`504`	`+LL + Either::Two(_t) => (),`
`505`	`505`	`\|`
`506`	`506`
`507`	`507`	error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
`@@ -519,7 +519,7 @@ LL \| &mut Either::One(_t) => (),`
`519`	`519`	`help: consider removing the mutable borrow`
`520`	`520`	`\|`
`521`	`521`	`LL - &mut Either::One(_t) => (),`
`522`		`-LL + mut Either::One(_t) => (),`
	`522`	`+LL + Either::One(_t) => (),`
`523`	`523`	`\|`
`524`	`524`
`525`	`525`	error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
`@@ -537,7 +537,7 @@ LL \| &mut Either::One(_t) => (),`
`537`	`537`	`help: consider removing the mutable borrow`
`538`	`538`	`\|`
`539`	`539`	`LL - &mut Either::One(_t) => (),`
`540`		`-LL + mut Either::One(_t) => (),`
	`540`	`+LL + Either::One(_t) => (),`
`541`	`541`	`\|`
`542`	`542`
`543`	`543`	error[E0507]: cannot move out of `rm` as enum variant `One` which is behind a mutable reference
`@@ -555,7 +555,7 @@ LL \| &mut Either::One(_t) => (),`
`555`	`555`	`help: consider removing the mutable borrow`
`556`	`556`	`\|`
`557`	`557`	`LL - &mut Either::One(_t) => (),`
`558`		`-LL + mut Either::One(_t) => (),`
	`558`	`+LL + Either::One(_t) => (),`
`559`	`559`	`\|`
`560`	`560`
`561`	`561`	`error[E0507]: cannot move out of a shared reference`
`@@ -792,7 +792,7 @@ LL \| let &mut X(_t) = &mut xm;`
`792`	`792`	`help: consider removing the mutable borrow`
`793`	`793`	`\|`
`794`	`794`	`LL - let &mut X(_t) = &mut xm;`
`795`		`-LL + let mut X(_t) = &mut xm;`
	`795`	`+LL + let X(_t) = &mut xm;`
`796`	`796`	`\|`
`797`	`797`
`798`	`798`	`error[E0507]: cannot move out of a mutable reference`
`@@ -807,7 +807,7 @@ LL \| if let &mut Either::One(_t) = &mut em { }`
`807`	`807`	`help: consider removing the mutable borrow`
`808`	`808`	`\|`
`809`	`809`	`LL - if let &mut Either::One(_t) = &mut em { }`
`810`		`-LL + if let mut Either::One(_t) = &mut em { }`
	`810`	`+LL + if let Either::One(_t) = &mut em { }`
`811`	`811`	`\|`
`812`	`812`
`813`	`813`	`error[E0507]: cannot move out of a mutable reference`
`@@ -822,7 +822,7 @@ LL \| while let &mut Either::One(_t) = &mut em { }`
`822`	`822`	`help: consider removing the mutable borrow`
`823`	`823`	`\|`
`824`	`824`	`LL - while let &mut Either::One(_t) = &mut em { }`
`825`		`-LL + while let mut Either::One(_t) = &mut em { }`
	`825`	`+LL + while let Either::One(_t) = &mut em { }`
`826`	`826`	`\|`
`827`	`827`
`828`	`828`	`error[E0507]: cannot move out of a mutable reference`
`@@ -840,7 +840,7 @@ LL \| &mut Either::One(_t)`
`840`	`840`	`help: consider removing the mutable borrow`
`841`	`841`	`\|`
`842`	`842`	`LL - &mut Either::One(_t)`
`843`		`-LL + mut Either::One(_t)`
	`843`	`+LL + Either::One(_t)`
`844`	`844`	`\|`
`845`	`845`
`846`	`846`	`error[E0507]: cannot move out of a mutable reference`
`@@ -858,7 +858,7 @@ LL \| &mut Either::One(_t) => (),`
`858`	`858`	`help: consider removing the mutable borrow`
`859`	`859`	`\|`
`860`	`860`	`LL - &mut Either::One(_t) => (),`
`861`		`-LL + mut Either::One(_t) => (),`
	`861`	`+LL + Either::One(_t) => (),`
`862`	`862`	`\|`
`863`	`863`
`864`	`864`	`error[E0507]: cannot move out of a mutable reference`
`@@ -876,7 +876,7 @@ LL \| &mut Either::One(_t) => (),`
`876`	`876`	`help: consider removing the mutable borrow`
`877`	`877`	`\|`
`878`	`878`	`LL - &mut Either::One(_t) => (),`
`879`		`-LL + mut Either::One(_t) => (),`
	`879`	`+LL + Either::One(_t) => (),`
`880`	`880`	`\|`
`881`	`881`
`882`	`882`	`error[E0507]: cannot move out of a mutable reference`
`@@ -894,7 +894,7 @@ LL \| &mut Either::One(_t) => (),`
`894`	`894`	`help: consider removing the mutable borrow`
`895`	`895`	`\|`
`896`	`896`	`LL - &mut Either::One(_t) => (),`
`897`		`-LL + mut Either::One(_t) => (),`
	`897`	`+LL + Either::One(_t) => (),`
`898`	`898`	`\|`
`899`	`899`
`900`	`900`	`error[E0507]: cannot move out of a shared reference`
`@@ -924,7 +924,7 @@ LL \| fn f2(&mut X(_t): &mut X) { }`
`924`	`924`	`help: consider removing the mutable borrow`
`925`	`925`	`\|`
`926`	`926`	`LL - fn f2(&mut X(_t): &mut X) { }`
`927`		`-LL + fn f2(mut X(_t): &mut X) { }`
	`927`	`+LL + fn f2(X(_t): &mut X) { }`
`928`	`928`	`\|`
`929`	`929`
`930`	`930`	`error[E0507]: cannot move out of a shared reference`