Fix another strange suggestion span

compiler-errors · compiler-errors · commit a74db1abb3cd · 2023-07-10T20:09:28.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/mod.rs b/compiler/rustc_borrowck/src/diagnostics/mod.rs
@@ -1121,7 +1121,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                             err.eager_subdiagnostic(
                                 &self.infcx.tcx.sess.parse_sess.span_diagnostic,
                                 CaptureReasonSuggest::FreshReborrow {
-                                    span: fn_call_span.shrink_to_lo(),
+                                    span: move_span.shrink_to_hi(),
                                 });
                         }
                         if let Some(clone_trait) = tcx.lang_items().clone_trait()
diff --git a/compiler/rustc_borrowck/src/session_diagnostics.rs b/compiler/rustc_borrowck/src/session_diagnostics.rs
@@ -398,7 +398,7 @@ pub(crate) enum CaptureReasonSuggest<'tcx> {
     #[suggestion(
         borrowck_suggest_create_freash_reborrow,
         applicability = "maybe-incorrect",
-        code = "as_mut().",
+        code = ".as_mut()",
         style = "verbose"
     )]
     FreshReborrow {
diff --git a/tests/ui/moves/pin-mut-reborrow-infer-var-issue-107419.stderr b/tests/ui/moves/pin-mut-reborrow-infer-var-issue-107419.stderr
@@ -13,7 +13,7 @@ note: `Pin::<&'a mut T>::get_mut` takes ownership of the receiver `self`, which
 help: consider reborrowing the `Pin` instead of moving it
    |
 LL |     foo(r.as_mut().get_mut());
-   |           +++++++++
+   |          +++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/moves/pin-mut-reborrow.stderr b/tests/ui/moves/pin-mut-reborrow.stderr
@@ -16,7 +16,7 @@ LL |     fn foo(self: Pin<&mut Self>) {}
 help: consider reborrowing the `Pin` instead of moving it
    |
 LL |     foo.as_mut().foo();
-   |         +++++++++
+   |        +++++++++
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {`
`1121`	`1121`	`err.eager_subdiagnostic(`
`1122`	`1122`	`&self.infcx.tcx.sess.parse_sess.span_diagnostic,`
`1123`	`1123`	`CaptureReasonSuggest::FreshReborrow {`
`1124`		`- span: fn_call_span.shrink_to_lo(),`
	`1124`	`+ span: move_span.shrink_to_hi(),`
`1125`	`1125`	`});`
`1126`	`1126`	`}`
`1127`	`1127`	`if let Some(clone_trait) = tcx.lang_items().clone_trait()`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ note: `Pin::<&'a mut T>::get_mut` takes ownership of the receiver `self`, which
`13`	`13`	help: consider reborrowing the `Pin` instead of moving it
`14`	`14`	`\|`
`15`	`15`	`LL \| foo(r.as_mut().get_mut());`
`16`		`- \| +++++++++`
	`16`	`+ \| +++++++++`
`17`	`17`
`18`	`18`	`error: aborting due to previous error`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ LL \| fn foo(self: Pin<&mut Self>) {}`
`16`	`16`	help: consider reborrowing the `Pin` instead of moving it
`17`	`17`	`\|`
`18`	`18`	`LL \| foo.as_mut().foo();`
`19`		`- \| +++++++++`
	`19`	`+ \| +++++++++`
`20`	`20`
`21`	`21`	`error: aborting due to previous error`
`22`	`22`