reword message to be less vague

compiler-errors · compiler-errors · commit 8621285e3beb · 2023-06-28T17:51:01.000Z
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
@@ -4029,15 +4029,15 @@ fn hint_missing_borrow<'tcx>(
 
     if !to_borrow.is_empty() {
         err.multipart_suggestion_verbose(
-            "consider borrowing the argument",
+            "consider adjusting the signature so it borrows its argument",
             to_borrow,
             Applicability::MaybeIncorrect,
         );
     }
 
     if !remove_borrow.is_empty() {
         err.multipart_suggestion_verbose(
-            "do not borrow the argument",
+            "consider adjusting the signature so it does not borrow its argument",
             remove_borrow,
             Applicability::MaybeIncorrect,
         );
diff --git a/tests/ui/anonymous-higher-ranked-lifetime.stderr b/tests/ui/anonymous-higher-ranked-lifetime.stderr
@@ -13,7 +13,7 @@ note: required by a bound in `f1`
    |
 LL | fn f1<F>(_: F) where F: Fn(&(), &()) {}
    |                         ^^^^^^^^^^^^ required by this bound in `f1`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     f1(|_: &(), _: &()| {});
    |            +       +
@@ -33,7 +33,7 @@ note: required by a bound in `f2`
    |
 LL | fn f2<F>(_: F) where F: for<'a> Fn(&'a (), &()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f2`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     f2(|_: &(), _: &()| {});
    |            +       +
@@ -53,7 +53,7 @@ note: required by a bound in `f3`
    |
 LL | fn f3<'a, F>(_: F) where F: Fn(&'a (), &()) {}
    |                             ^^^^^^^^^^^^^^^ required by this bound in `f3`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     f3(|_: &(), _: &()| {});
    |            +       +
@@ -73,7 +73,7 @@ note: required by a bound in `f4`
    |
 LL | fn f4<F>(_: F) where F: for<'r> Fn(&(), &'r ()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f4`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     f4(|_: &(), _: &()| {});
    |            +       +
@@ -93,7 +93,7 @@ note: required by a bound in `f5`
    |
 LL | fn f5<F>(_: F) where F: for<'r> Fn(&'r (), &'r ()) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f5`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     f5(|_: &(), _: &()| {});
    |            +       +
@@ -113,7 +113,7 @@ note: required by a bound in `g1`
    |
 LL | fn g1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g1`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     g1(|_: &(), _: ()| {});
    |            +
@@ -133,7 +133,7 @@ note: required by a bound in `g2`
    |
 LL | fn g2<F>(_: F) where F: Fn(&(), fn(&())) {}
    |                         ^^^^^^^^^^^^^^^^ required by this bound in `g2`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     g2(|_: &(), _: ()| {});
    |            +
@@ -153,7 +153,7 @@ note: required by a bound in `g3`
    |
 LL | fn g3<F>(_: F) where F: for<'s> Fn(&'s (), Box<dyn Fn(&())>) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g3`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     g3(|_: &(), _: ()| {});
    |            +
@@ -173,7 +173,7 @@ note: required by a bound in `g4`
    |
 LL | fn g4<F>(_: F) where F: Fn(&(), for<'r> fn(&'r ())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g4`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     g4(|_: &(), _: ()| {});
    |            +
@@ -193,7 +193,7 @@ note: required by a bound in `h1`
    |
 LL | fn h1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>, &(), fn(&(), &())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h1`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     h1(|_: &(), _: (), _: &(), _: ()| {});
    |            +              +
@@ -213,7 +213,7 @@ note: required by a bound in `h2`
    |
 LL | fn h2<F>(_: F) where F: for<'t0> Fn(&(), Box<dyn Fn(&())>, &'t0 (), fn(&(), &())) {}
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h2`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     h2(|_: &(), _: (), _: &(), _: ()| {});
    |            +              +
diff --git a/tests/ui/closures/multiple-fn-bounds.stderr b/tests/ui/closures/multiple-fn-bounds.stderr
@@ -18,7 +18,7 @@ note: required by a bound in `foo`
    |
 LL | fn foo<F: Fn(&char) -> bool + Fn(char) -> bool>(f: F) {
    |                               ^^^^^^^^^^^^^^^^ required by this bound in `foo`
-help: do not borrow the argument
+help: consider adjusting the signature so it does not borrow its argument
    |
 LL |     foo(move |char| v);
    |               ~~~~
diff --git a/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.stderr b/tests/ui/mismatched_types/closure-arg-type-mismatch-issue-45727.stderr
@@ -10,7 +10,7 @@ LL |     let _ = (-10..=10).find(|x: i32| x.signum() == 0);
               found closure signature `fn(i32) -> _`
 note: required by a bound in `find`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     let _ = (-10..=10).find(|x: &i32| x.signum() == 0);
    |                                 +
@@ -27,7 +27,7 @@ LL |     let _ = (-10..=10).find(|x: &&&i32| x.signum() == 0);
               found closure signature `for<'a, 'b, 'c> fn(&'a &'b &'c i32) -> _`
 note: required by a bound in `find`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-help: do not borrow the argument
+help: consider adjusting the signature so it does not borrow its argument
    |
 LL -     let _ = (-10..=10).find(|x: &&&i32| x.signum() == 0);
 LL +     let _ = (-10..=10).find(|x: &i32| x.signum() == 0);
diff --git a/tests/ui/mismatched_types/closure-arg-type-mismatch.stderr b/tests/ui/mismatched_types/closure-arg-type-mismatch.stderr
@@ -10,7 +10,7 @@ LL |     a.iter().map(|_: (u32, u32)| 45);
               found closure signature `fn((u32, u32)) -> _`
 note: required by a bound in `map`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     a.iter().map(|_: &(u32, u32)| 45);
    |                      +
diff --git a/tests/ui/mismatched_types/issue-36053-2.stderr b/tests/ui/mismatched_types/issue-36053-2.stderr
@@ -10,7 +10,7 @@ LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
               found closure signature `for<'a> fn(&'a str) -> _`
 note: required by a bound in `filter`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     once::<&str>("str").fuse().filter(|a: &&str| true).count();
    |                                           +
diff --git a/tests/ui/mismatched_types/suggest-option-asderef-inference-var.stderr b/tests/ui/mismatched_types/suggest-option-asderef-inference-var.stderr
@@ -13,7 +13,7 @@ LL |     let _has_inference_vars: Option<i32> = Some(0).map(deref_int);
               found function signature `for<'a> fn(&'a i32) -> _`
 note: required by a bound in `Option::<T>::map`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-help: do not borrow the argument
+help: consider adjusting the signature so it does not borrow its argument
    |
 LL - fn deref_int(a: &i32) -> i32 {
 LL + fn deref_int(a: i32) -> i32 {
diff --git a/tests/ui/mismatched_types/suggest-option-asderef.fixed b/tests/ui/mismatched_types/suggest-option-asderef.fixed
@@ -17,7 +17,7 @@ fn generic<T>(_: T) -> Option<()> {
 }
 
 fn generic_ref<T>(_: T) -> Option<()> {
-    //~^ HELP do not borrow the argument
+    //~^ HELP consider adjusting the signature so it does not borrow its argument
     Some(())
 }
 
diff --git a/tests/ui/mismatched_types/suggest-option-asderef.rs b/tests/ui/mismatched_types/suggest-option-asderef.rs
@@ -17,7 +17,7 @@ fn generic<T>(_: T) -> Option<()> {
 }
 
 fn generic_ref<T>(_: &T) -> Option<()> {
-    //~^ HELP do not borrow the argument
+    //~^ HELP consider adjusting the signature so it does not borrow its argument
     Some(())
 }
 
diff --git a/tests/ui/mismatched_types/suggest-option-asderef.stderr b/tests/ui/mismatched_types/suggest-option-asderef.stderr
@@ -73,7 +73,7 @@ LL |     let _ = produces_string().and_then(generic_ref);
               found function signature `for<'a> fn(&'a _) -> _`
 note: required by a bound in `Option::<T>::and_then`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-help: do not borrow the argument
+help: consider adjusting the signature so it does not borrow its argument
    |
 LL - fn generic_ref<T>(_: &T) -> Option<()> {
 LL + fn generic_ref<T>(_: T) -> Option<()> {
diff --git a/tests/ui/suggestions/late-bound-in-borrow-closure-sugg.stderr b/tests/ui/suggestions/late-bound-in-borrow-closure-sugg.stderr
@@ -16,7 +16,7 @@ note: required by a bound in `Trader::<'a>::set_closure`
    |
 LL |     pub fn set_closure(&mut self, function: impl Fn(&mut Trader) + 'a) {
    |                                                  ^^^^^^^^^^^^^^^ required by this bound in `Trader::<'a>::set_closure`
-help: consider borrowing the argument
+help: consider adjusting the signature so it borrows its argument
    |
 LL |     let closure = |trader : &mut Trader| {
    |                             ++++

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ note: required by a bound in `f1`
`13`	`13`	`\|`
`14`	`14`	`LL \| fn f1<F>(_: F) where F: Fn(&(), &()) {}`
`15`	`15`	\| ^^^^^^^^^^^^ required by this bound in `f1`
`16`		`-help: consider borrowing the argument`
	`16`	`+help: consider adjusting the signature so it borrows its argument`
`17`	`17`	`\|`
`18`	`18`	`LL \| f1(\|_: &(), _: &()\| {});`
`19`	`19`	`\| + +`
@@ -33,7 +33,7 @@ note: required by a bound in `f2`
`33`	`33`	`\|`
`34`	`34`	`LL \| fn f2<F>(_: F) where F: for<'a> Fn(&'a (), &()) {}`
`35`	`35`	\| ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f2`
`36`		`-help: consider borrowing the argument`
	`36`	`+help: consider adjusting the signature so it borrows its argument`
`37`	`37`	`\|`
`38`	`38`	`LL \| f2(\|_: &(), _: &()\| {});`
`39`	`39`	`\| + +`
@@ -53,7 +53,7 @@ note: required by a bound in `f3`
`53`	`53`	`\|`
`54`	`54`	`LL \| fn f3<'a, F>(_: F) where F: Fn(&'a (), &()) {}`
`55`	`55`	\| ^^^^^^^^^^^^^^^ required by this bound in `f3`
`56`		`-help: consider borrowing the argument`
	`56`	`+help: consider adjusting the signature so it borrows its argument`
`57`	`57`	`\|`
`58`	`58`	`LL \| f3(\|_: &(), _: &()\| {});`
`59`	`59`	`\| + +`
@@ -73,7 +73,7 @@ note: required by a bound in `f4`
`73`	`73`	`\|`
`74`	`74`	`LL \| fn f4<F>(_: F) where F: for<'r> Fn(&(), &'r ()) {}`
`75`	`75`	\| ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f4`
`76`		`-help: consider borrowing the argument`
	`76`	`+help: consider adjusting the signature so it borrows its argument`
`77`	`77`	`\|`
`78`	`78`	`LL \| f4(\|_: &(), _: &()\| {});`
`79`	`79`	`\| + +`
@@ -93,7 +93,7 @@ note: required by a bound in `f5`
`93`	`93`	`\|`
`94`	`94`	`LL \| fn f5<F>(_: F) where F: for<'r> Fn(&'r (), &'r ()) {}`
`95`	`95`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `f5`
`96`		`-help: consider borrowing the argument`
	`96`	`+help: consider adjusting the signature so it borrows its argument`
`97`	`97`	`\|`
`98`	`98`	`LL \| f5(\|_: &(), _: &()\| {});`
`99`	`99`	`\| + +`
@@ -113,7 +113,7 @@ note: required by a bound in `g1`
`113`	`113`	`\|`
`114`	`114`	`LL \| fn g1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>) {}`
`115`	`115`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g1`
`116`		`-help: consider borrowing the argument`
	`116`	`+help: consider adjusting the signature so it borrows its argument`
`117`	`117`	`\|`
`118`	`118`	`LL \| g1(\|_: &(), _: ()\| {});`
`119`	`119`	`\| +`
@@ -133,7 +133,7 @@ note: required by a bound in `g2`
`133`	`133`	`\|`
`134`	`134`	`LL \| fn g2<F>(_: F) where F: Fn(&(), fn(&())) {}`
`135`	`135`	\| ^^^^^^^^^^^^^^^^ required by this bound in `g2`
`136`		`-help: consider borrowing the argument`
	`136`	`+help: consider adjusting the signature so it borrows its argument`
`137`	`137`	`\|`
`138`	`138`	`LL \| g2(\|_: &(), _: ()\| {});`
`139`	`139`	`\| +`
@@ -153,7 +153,7 @@ note: required by a bound in `g3`
`153`	`153`	`\|`
`154`	`154`	`LL \| fn g3<F>(_: F) where F: for<'s> Fn(&'s (), Box<dyn Fn(&())>) {}`
`155`	`155`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g3`
`156`		`-help: consider borrowing the argument`
	`156`	`+help: consider adjusting the signature so it borrows its argument`
`157`	`157`	`\|`
`158`	`158`	`LL \| g3(\|_: &(), _: ()\| {});`
`159`	`159`	`\| +`
@@ -173,7 +173,7 @@ note: required by a bound in `g4`
`173`	`173`	`\|`
`174`	`174`	`LL \| fn g4<F>(_: F) where F: Fn(&(), for<'r> fn(&'r ())) {}`
`175`	`175`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `g4`
`176`		`-help: consider borrowing the argument`
	`176`	`+help: consider adjusting the signature so it borrows its argument`
`177`	`177`	`\|`
`178`	`178`	`LL \| g4(\|_: &(), _: ()\| {});`
`179`	`179`	`\| +`
@@ -193,7 +193,7 @@ note: required by a bound in `h1`
`193`	`193`	`\|`
`194`	`194`	`LL \| fn h1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>, &(), fn(&(), &())) {}`
`195`	`195`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h1`
`196`		`-help: consider borrowing the argument`
	`196`	`+help: consider adjusting the signature so it borrows its argument`
`197`	`197`	`\|`
`198`	`198`	`LL \| h1(\|_: &(), _: (), _: &(), _: ()\| {});`
`199`	`199`	`\| + +`
@@ -213,7 +213,7 @@ note: required by a bound in `h2`
`213`	`213`	`\|`
`214`	`214`	`LL \| fn h2<F>(_: F) where F: for<'t0> Fn(&(), Box<dyn Fn(&())>, &'t0 (), fn(&(), &())) {}`
`215`	`215`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `h2`
`216`		`-help: consider borrowing the argument`
	`216`	`+help: consider adjusting the signature so it borrows its argument`
`217`	`217`	`\|`
`218`	`218`	`LL \| h2(\|_: &(), _: (), _: &(), _: ()\| {});`
`219`	`219`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ note: required by a bound in `foo`
`18`	`18`	`\|`
`19`	`19`	`LL \| fn foo<F: Fn(&char) -> bool + Fn(char) -> bool>(f: F) {`
`20`	`20`	\| ^^^^^^^^^^^^^^^^ required by this bound in `foo`
`21`		`-help: do not borrow the argument`
	`21`	`+help: consider adjusting the signature so it does not borrow its argument`
`22`	`22`	`\|`
`23`	`23`	`LL \| foo(move \|char\| v);`
`24`	`24`	`\| ~~~~`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ LL \| a.iter().map(\|_: (u32, u32)\| 45);`
`10`	`10`	found closure signature `fn((u32, u32)) -> _`
`11`	`11`	note: required by a bound in `map`
`12`	`12`	`--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`13`		`-help: consider borrowing the argument`
	`13`	`+help: consider adjusting the signature so it borrows its argument`
`14`	`14`	`\|`
`15`	`15`	`LL \| a.iter().map(\|_: &(u32, u32)\| 45);`
`16`	`16`	`\| +`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ LL \| once::<&str>("str").fuse().filter(\|a: &str\| true).count();`
`10`	`10`	found closure signature `for<'a> fn(&'a str) -> _`
`11`	`11`	note: required by a bound in `filter`
`12`	`12`	`--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`13`		`-help: consider borrowing the argument`
	`13`	`+help: consider adjusting the signature so it borrows its argument`
`14`	`14`	`\|`
`15`	`15`	`LL \| once::<&str>("str").fuse().filter(\|a: &&str\| true).count();`
`16`	`16`	`\| +`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ LL \| let _has_inference_vars: Option<i32> = Some(0).map(deref_int);`
`13`	`13`	found function signature `for<'a> fn(&'a i32) -> _`
`14`	`14`	note: required by a bound in `Option::<T>::map`
`15`	`15`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`16`		`-help: do not borrow the argument`
	`16`	`+help: consider adjusting the signature so it does not borrow its argument`
`17`	`17`	`\|`
`18`	`18`	`LL - fn deref_int(a: &i32) -> i32 {`
`19`	`19`	`LL + fn deref_int(a: i32) -> i32 {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ fn generic<T>(_: T) -> Option<()> {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`fn generic_ref<T>(_: T) -> Option<()> {`
`20`		`- //~^ HELP do not borrow the argument`
	`20`	`+ //~^ HELP consider adjusting the signature so it does not borrow its argument`
`21`	`21`	`Some(())`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ LL \| let _ = produces_string().and_then(generic_ref);`
`73`	`73`	found function signature `for<'a> fn(&'a _) -> _`
`74`	`74`	note: required by a bound in `Option::<T>::and_then`
`75`	`75`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`76`		`-help: do not borrow the argument`
	`76`	`+help: consider adjusting the signature so it does not borrow its argument`
`77`	`77`	`\|`
`78`	`78`	`LL - fn generic_ref<T>(_: &T) -> Option<()> {`
`79`	`79`	`LL + fn generic_ref<T>(_: T) -> Option<()> {`
Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ note: required by a bound in `Trader::<'a>::set_closure`
`16`	`16`	`\|`
`17`	`17`	`LL \| pub fn set_closure(&mut self, function: impl Fn(&mut Trader) + 'a) {`
`18`	`18`	\| ^^^^^^^^^^^^^^^ required by this bound in `Trader::<'a>::set_closure`
`19`		`-help: consider borrowing the argument`
	`19`	`+help: consider adjusting the signature so it borrows its argument`
`20`	`20`	`\|`
`21`	`21`	`LL \| let closure = \|trader : &mut Trader\| {`
`22`	`22`	`\| ++++`