Don't use method span on clone suggestion

compiler-errors · compiler-errors · commit 3a3f4a21445d · 2023-07-10T20:09:28.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/mod.rs b/compiler/rustc_borrowck/src/diagnostics/mod.rs
@@ -1135,10 +1135,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                             && self.infcx.predicate_must_hold_modulo_regions(&o)
                         {
                             err.span_suggestion_verbose(
-                                fn_call_span.shrink_to_lo(),
+                                move_span.shrink_to_hi(),
                                 "you can `clone` the value and consume it, but this might not be \
                                  your desired behavior",
-                                "clone().".to_string(),
+                                ".clone()".to_string(),
                                 Applicability::MaybeIncorrect,
                             );
                         }
diff --git a/tests/ui/async-await/clone-suggestion.stderr b/tests/ui/async-await/clone-suggestion.stderr
@@ -13,7 +13,7 @@ note: `into_future` takes ownership of the receiver `self`, which moves `f`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     f.clone().await;
-   |       ++++++++
+   |      ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr b/tests/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr
@@ -11,7 +11,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves value
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     let _x = Rc::new(vec![1, 2]).clone().into_iter();
-   |                                  ++++++++
+   |                                 ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/borrowck/clone-span-on-try-operator.fixed b/tests/ui/borrowck/clone-span-on-try-operator.fixed
@@ -0,0 +1,11 @@
+// run-rustfix
+
+#[derive(Clone)]
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+fn main() {
+    let foo = &Foo;
+    (*foo).clone().foo(); //~ ERROR cannot move out
+}
diff --git a/tests/ui/borrowck/clone-span-on-try-operator.rs b/tests/ui/borrowck/clone-span-on-try-operator.rs
@@ -0,0 +1,11 @@
+// run-rustfix
+
+#[derive(Clone)]
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+fn main() {
+    let foo = &Foo;
+    (*foo).foo(); //~ ERROR cannot move out
+}
diff --git a/tests/ui/borrowck/clone-span-on-try-operator.stderr b/tests/ui/borrowck/clone-span-on-try-operator.stderr
@@ -0,0 +1,21 @@
+error[E0507]: cannot move out of `*foo` which is behind a shared reference
+  --> $DIR/clone-span-on-try-operator.rs:10:5
+   |
+LL |     (*foo).foo();
+   |     ^^^^^^ ----- `*foo` moved due to this method call
+   |     |
+   |     move occurs because `*foo` has type `Foo`, which does not implement the `Copy` trait
+   |
+note: `Foo::foo` takes ownership of the receiver `self`, which moves `*foo`
+  --> $DIR/clone-span-on-try-operator.rs:6:12
+   |
+LL |     fn foo(self) {}
+   |            ^^^^
+help: you can `clone` the value and consume it, but this might not be your desired behavior
+   |
+LL |     (*foo).clone().foo();
+   |           ++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr b/tests/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr
@@ -15,7 +15,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `y`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |         y.clone().into_iter();
-   |           ++++++++
+   |          ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/codemap_tests/tab_3.stderr b/tests/ui/codemap_tests/tab_3.stderr
@@ -15,7 +15,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `some_vec`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     some_vec.clone().into_iter();
-   |              ++++++++
+   |             ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/moves/move-fn-self-receiver.stderr b/tests/ui/moves/move-fn-self-receiver.stderr
@@ -12,7 +12,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `val.0`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     val.0.clone().into_iter().next();
-   |           ++++++++
+   |          ++++++++
 
 error[E0382]: use of moved value: `foo`
   --> $DIR/move-fn-self-receiver.rs:34:5
@@ -102,7 +102,7 @@ LL |     fn use_rc_self(self: Rc<Self>) {}
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     rc_foo.clone().use_rc_self();
-   |            ++++++++
+   |           ++++++++
 
 error[E0382]: use of moved value: `foo_add`
   --> $DIR/move-fn-self-receiver.rs:59:5
@@ -145,7 +145,7 @@ LL |     explicit_into_iter;
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     for _val in explicit_into_iter.clone().into_iter() {}
-   |                                    ++++++++
+   |                                   ++++++++
 
 error[E0382]: use of moved value: `container`
   --> $DIR/move-fn-self-receiver.rs:71:5
diff --git a/tests/ui/moves/moves-based-on-type-access-to-field.stderr b/tests/ui/moves/moves-based-on-type-access-to-field.stderr
@@ -13,7 +13,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     consume(x.clone().into_iter().next().unwrap());
-   |               ++++++++
+   |              ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/moves/moves-based-on-type-exprs.stderr b/tests/ui/moves/moves-based-on-type-exprs.stderr
@@ -165,7 +165,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     let _y = x.clone().into_iter().next().unwrap();
-   |                ++++++++
+   |               ++++++++
 
 error[E0382]: borrow of moved value: `x`
   --> $DIR/moves-based-on-type-exprs.rs:83:11
@@ -182,7 +182,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     let _y = [x.clone().into_iter().next().unwrap(); 1];
-   |                 ++++++++
+   |                ++++++++
 
 error: aborting due to 11 previous errors
 
diff --git a/tests/ui/moves/suggest-clone.stderr b/tests/ui/moves/suggest-clone.stderr
@@ -14,7 +14,7 @@ LL |     fn foo(self) {}
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     foo.clone().foo();
-   |         ++++++++
+   |        ++++++++
 
 error: aborting due to previous error
 
diff --git a/tests/ui/suggestions/option-content-move.stderr b/tests/ui/suggestions/option-content-move.stderr
@@ -12,7 +12,7 @@ note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |                 if selection.1.clone().unwrap().contains(selection.0) {
-   |                                ++++++++
+   |                               ++++++++
 
 error[E0507]: cannot move out of `selection.1` which is behind a shared reference
   --> $DIR/option-content-move.rs:27:20
@@ -28,7 +28,7 @@ note: `Result::<T, E>::unwrap` takes ownership of the receiver `self`, which mov
 help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |                 if selection.1.clone().unwrap().contains(selection.0) {
-   |                                ++++++++
+   |                               ++++++++
 
 error: aborting due to 2 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -1135,10 +1135,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {`
`1135`	`1135`	`&& self.infcx.predicate_must_hold_modulo_regions(&o)`
`1136`	`1136`	`{`
`1137`	`1137`	`err.span_suggestion_verbose(`
`1138`		`- fn_call_span.shrink_to_lo(),`
	`1138`	`+ move_span.shrink_to_hi(),`
`1139`	`1139`	"you can `clone` the value and consume it, but this might not be \
`1140`	`1140`	`your desired behavior",`
`1141`		`- "clone().".to_string(),`
	`1141`	`+ ".clone()".to_string(),`
`1142`	`1142`	`Applicability::MaybeIncorrect,`
`1143`	`1143`	`);`
`1144`	`1144`	`}`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ note: `into_future` takes ownership of the receiver `self`, which moves `f`
`13`	`13`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`14`	`14`	`\|`
`15`	`15`	`LL \| f.clone().await;`
`16`		`- \| ++++++++`
	`16`	`+ \| ++++++++`
`17`	`17`
`18`	`18`	`error: aborting due to previous error`
`19`	`19`
Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves value
`11`	`11`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`12`	`12`	`\|`
`13`	`13`	`LL \| let _x = Rc::new(vec![1, 2]).clone().into_iter();`
`14`		`- \| ++++++++`
	`14`	`+ \| ++++++++`
`15`	`15`
`16`	`16`	`error: aborting due to previous error`
`17`	`17`
Original file line number	Diff line number	Diff line change
@@ -15,7 +15,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `y`
`15`	`15`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`16`	`16`	`\|`
`17`	`17`	`LL \| y.clone().into_iter();`
`18`		`- \| ++++++++`
	`18`	`+ \| ++++++++`
`19`	`19`
`20`	`20`	`error: aborting due to previous error`
`21`	`21`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
`13`	`13`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`14`	`14`	`\|`
`15`	`15`	`LL \| consume(x.clone().into_iter().next().unwrap());`
`16`		`- \| ++++++++`
	`16`	`+ \| ++++++++`
`17`	`17`
`18`	`18`	`error: aborting due to previous error`
`19`	`19`
Original file line number	Diff line number	Diff line change
@@ -165,7 +165,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
`165`	`165`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`166`	`166`	`\|`
`167`	`167`	`LL \| let _y = x.clone().into_iter().next().unwrap();`
`168`		`- \| ++++++++`
	`168`	`+ \| ++++++++`
`169`	`169`
`170`	`170`	error[E0382]: borrow of moved value: `x`
`171`	`171`	`--> $DIR/moves-based-on-type-exprs.rs:83:11`
@@ -182,7 +182,7 @@ note: `into_iter` takes ownership of the receiver `self`, which moves `x`
`182`	`182`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`183`	`183`	`\|`
`184`	`184`	`LL \| let _y = [x.clone().into_iter().next().unwrap(); 1];`
`185`		`- \| ++++++++`
	`185`	`+ \| ++++++++`
`186`	`186`
`187`	`187`	`error: aborting due to 11 previous errors`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ LL \| fn foo(self) {}`
`14`	`14`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`15`	`15`	`\|`
`16`	`16`	`LL \| foo.clone().foo();`
`17`		`- \| ++++++++`
	`17`	`+ \| ++++++++`
`18`	`18`
`19`	`19`	`error: aborting due to previous error`
`20`	`20`
Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ note: `Option::<T>::unwrap` takes ownership of the receiver `self`, which moves
`12`	`12`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`13`	`13`	`\|`
`14`	`14`	`LL \| if selection.1.clone().unwrap().contains(selection.0) {`
`15`		`- \| ++++++++`
	`15`	`+ \| ++++++++`
`16`	`16`
`17`	`17`	error[E0507]: cannot move out of `selection.1` which is behind a shared reference
`18`	`18`	`--> $DIR/option-content-move.rs:27:20`
@@ -28,7 +28,7 @@ note: `Result::<T, E>::unwrap` takes ownership of the receiver `self`, which mov
`28`	`28`	help: you can `clone` the value and consume it, but this might not be your desired behavior
`29`	`29`	`\|`
`30`	`30`	`LL \| if selection.1.clone().unwrap().contains(selection.0) {`
`31`		`- \| ++++++++`
	`31`	`+ \| ++++++++`
`32`	`32`
`33`	`33`	`error: aborting due to 2 previous errors`
`34`	`34`