Tweak wording

estebank · estebank · commit b312b667677d · 2023-11-15T03:51:05.000Z
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -2813,7 +2813,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                                 sugg,
                                 Applicability::MaybeIncorrect,
                             );
-                            "...or alternatively,"
+                            "...or alternatively, you might want"
                         } else if let Some((kind, _span)) =
                             self.diagnostic_metadata.current_function
                             && let FnKind::Fn(_, _, sig, _, _, _) = kind
@@ -2871,9 +2871,9 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                                     higher_ranked
                                 },
                             );
-                            "...or alternatively,"
+                            "alternatively, you might want"
                         } else {
-                            "instead, you are more likely"
+                            "instead, you are more likely to want"
                         };
                         let mut sugg = vec![(lt.span, String::new())];
                         if let Some((kind, _span)) =
@@ -2906,7 +2906,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                             }
                         };
                         err.multipart_suggestion_verbose(
-                            format!("{pre} to want to return an owned value"),
+                            format!("{pre} to return an owned value"),
                             sugg,
                             Applicability::MaybeIncorrect,
                         );
diff --git a/tests/ui/c-variadic/variadic-ffi-6.stderr b/tests/ui/c-variadic/variadic-ffi-6.stderr
@@ -13,7 +13,7 @@ help: instead, you are more likely to want to change one of the arguments to be
    |
 LL |     x: &usize,
    |        +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - ) -> &usize {
 LL + ) -> usize {
diff --git a/tests/ui/lifetimes/issue-26638.stderr b/tests/ui/lifetimes/issue-26638.stderr
@@ -25,7 +25,7 @@ help: instead, you are more likely to want to change the argument to be borrowed
    |
 LL | fn parse_type_2(iter: &fn(&u8)->&u8) -> &str { iter() }
    |                       +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL | fn parse_type_2(iter: fn(&u8)->&u8) -> String { iter() }
    |                                        ~~~~~~
diff --git a/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/tests/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
@@ -54,7 +54,7 @@ help: instead, you are more likely to want to change the argument to be borrowed
    |
 LL | fn i(_x: &isize) -> &isize {
    |          +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - fn i(_x: isize) -> &isize {
 LL + fn i(_x: isize) -> isize {
@@ -75,7 +75,7 @@ help: instead, you are more likely to want to change the argument to be borrowed
    |
 LL | fn j(_x: &StaticStr) -> &isize {
    |          +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - fn j(_x: StaticStr) -> &isize {
 LL + fn j(_x: StaticStr) -> isize {
@@ -96,7 +96,7 @@ help: instead, you are more likely to want to change the argument to be borrowed
    |
 LL | fn k<'a, T: WithLifetime<'a>>(_x: &T::Output) -> &isize {
    |                                   +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize {
 LL + fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> isize {
@@ -117,7 +117,7 @@ help: instead, you are more likely to want to change one of the arguments to be
    |
 LL | fn l<'a>(_: &&'a str, _: &&'a str) -> &str { "" }
    |             +            +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL | fn l<'a>(_: &'a str, _: &'a str) -> String { "" }
    |                                     ~~~~~~
diff --git a/tests/ui/self/elision/nested-item.stderr b/tests/ui/self/elision/nested-item.stderr
@@ -29,7 +29,7 @@ help: instead, you are more likely to want to change the argument to be borrowed
    |
 LL | fn wrap(self: &Wrap<{ fn bar(&self) {} }>) -> &() {
    |               +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() {
 LL + fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> () {
diff --git a/tests/ui/suggestions/impl-trait-missing-lifetime-gated.stderr b/tests/ui/suggestions/impl-trait-missing-lifetime-gated.stderr
@@ -13,7 +13,7 @@ help: consider introducing a named lifetime parameter
    |
 LL |     fn g<'a>(mut x: impl Iterator<Item = &'a ()>) -> Option<&'a ()> { x.next() }
    |         ++++                             ~~~                ~~~
-help: ...or alternatively, to want to return an owned value
+help: alternatively, you might want to return an owned value
    |
 LL -     fn g(mut x: impl Iterator<Item = &()>) -> Option<&()> { x.next() }
 LL +     fn g(mut x: impl Iterator<Item = &()>) -> Option<()> { x.next() }
@@ -34,7 +34,7 @@ help: consider introducing a named lifetime parameter
    |
 LL |     async fn i<'a>(mut x: impl Iterator<Item = &'a ()>) -> Option<&'a ()> { x.next() }
    |               ++++                             ~~~                ~~~
-help: ...or alternatively, to want to return an owned value
+help: alternatively, you might want to return an owned value
    |
 LL -     async fn i(mut x: impl Iterator<Item = &()>) -> Option<&()> { x.next() }
 LL +     async fn i(mut x: impl Iterator<Item = &()>) -> Option<()> { x.next() }
@@ -79,7 +79,7 @@ help: consider introducing a named lifetime parameter
    |
 LL |     fn g<'a>(mut x: impl Foo) -> Option<&'a ()> { x.next() }
    |         ++++                            ~~~
-help: ...or alternatively, to want to return an owned value
+help: alternatively, you might want to return an owned value
    |
 LL -     fn g(mut x: impl Foo) -> Option<&()> { x.next() }
 LL +     fn g(mut x: impl Foo) -> Option<()> { x.next() }
@@ -100,7 +100,7 @@ help: consider introducing a named lifetime parameter
    |
 LL |     fn g<'a>(mut x: impl Foo<()>) -> Option<&'a ()> { x.next() }
    |         ++++                                ~~~
-help: ...or alternatively, to want to return an owned value
+help: alternatively, you might want to return an owned value
    |
 LL -     fn g(mut x: impl Foo<()>) -> Option<&()> { x.next() }
 LL +     fn g(mut x: impl Foo<()>) -> Option<()> { x.next() }
diff --git a/tests/ui/suggestions/return-elided-lifetime.stderr b/tests/ui/suggestions/return-elided-lifetime.stderr
@@ -44,7 +44,7 @@ help: instead, you are more likely to want to change one of the arguments to be
    |
 LL | fn f2(a: &i32, b: &i32) -> &i32 { loop {} }
    |          +        +
-help: ...or alternatively, to want to return an owned value
+help: ...or alternatively, you might want to return an owned value
    |
 LL - fn f2(a: i32, b: i32) -> &i32 { loop {} }
 LL + fn f2(a: i32, b: i32) -> i32 { loop {} }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ help: instead, you are more likely to want to change one of the arguments to be`
`13`	`13`	`\|`
`14`	`14`	`LL \| x: &usize,`
`15`	`15`	`\| +`
`16`		`-help: ...or alternatively, to want to return an owned value`
	`16`	`+help: ...or alternatively, you might want to return an owned value`
`17`	`17`	`\|`
`18`	`18`	`LL - ) -> &usize {`
`19`	`19`	`LL + ) -> usize {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ help: instead, you are more likely to want to change the argument to be borrowed`
`25`	`25`	`\|`
`26`	`26`	`LL \| fn parse_type_2(iter: &fn(&u8)->&u8) -> &str { iter() }`
`27`	`27`	`\| +`
`28`		`-help: ...or alternatively, to want to return an owned value`
	`28`	`+help: ...or alternatively, you might want to return an owned value`
`29`	`29`	`\|`
`30`	`30`	`LL \| fn parse_type_2(iter: fn(&u8)->&u8) -> String { iter() }`
`31`	`31`	`\| ~~~~~~`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ help: instead, you are more likely to want to change the argument to be borrowed`
`54`	`54`	`\|`
`55`	`55`	`LL \| fn i(_x: &isize) -> &isize {`
`56`	`56`	`\| +`
`57`		`-help: ...or alternatively, to want to return an owned value`
	`57`	`+help: ...or alternatively, you might want to return an owned value`
`58`	`58`	`\|`
`59`	`59`	`LL - fn i(_x: isize) -> &isize {`
`60`	`60`	`LL + fn i(_x: isize) -> isize {`
`@@ -75,7 +75,7 @@ help: instead, you are more likely to want to change the argument to be borrowed`
`75`	`75`	`\|`
`76`	`76`	`LL \| fn j(_x: &StaticStr) -> &isize {`
`77`	`77`	`\| +`
`78`		`-help: ...or alternatively, to want to return an owned value`
	`78`	`+help: ...or alternatively, you might want to return an owned value`
`79`	`79`	`\|`
`80`	`80`	`LL - fn j(_x: StaticStr) -> &isize {`
`81`	`81`	`LL + fn j(_x: StaticStr) -> isize {`
`@@ -96,7 +96,7 @@ help: instead, you are more likely to want to change the argument to be borrowed`
`96`	`96`	`\|`
`97`	`97`	`LL \| fn k<'a, T: WithLifetime<'a>>(_x: &T::Output) -> &isize {`
`98`	`98`	`\| +`
`99`		`-help: ...or alternatively, to want to return an owned value`
	`99`	`+help: ...or alternatively, you might want to return an owned value`
`100`	`100`	`\|`
`101`	`101`	`LL - fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize {`
`102`	`102`	`LL + fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> isize {`
`@@ -117,7 +117,7 @@ help: instead, you are more likely to want to change one of the arguments to be`
`117`	`117`	`\|`
`118`	`118`	`LL \| fn l<'a>(_: &&'a str, _: &&'a str) -> &str { "" }`
`119`	`119`	`\| + +`
`120`		`-help: ...or alternatively, to want to return an owned value`
	`120`	`+help: ...or alternatively, you might want to return an owned value`
`121`	`121`	`\|`
`122`	`122`	`LL \| fn l<'a>(_: &'a str, _: &'a str) -> String { "" }`
`123`	`123`	`\| ~~~~~~`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ help: instead, you are more likely to want to change the argument to be borrowed`
`29`	`29`	`\|`
`30`	`30`	`LL \| fn wrap(self: &Wrap<{ fn bar(&self) {} }>) -> &() {`
`31`	`31`	`\| +`
`32`		`-help: ...or alternatively, to want to return an owned value`
	`32`	`+help: ...or alternatively, you might want to return an owned value`
`33`	`33`	`\|`
`34`	`34`	`LL - fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() {`
`35`	`35`	`LL + fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> () {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ help: consider introducing a named lifetime parameter`
`13`	`13`	`\|`
`14`	`14`	`LL \| fn g<'a>(mut x: impl Iterator<Item = &'a ()>) -> Option<&'a ()> { x.next() }`
`15`	`15`	`\| ++++ ~~~ ~~~`
`16`		`-help: ...or alternatively, to want to return an owned value`
	`16`	`+help: alternatively, you might want to return an owned value`
`17`	`17`	`\|`
`18`	`18`	`LL - fn g(mut x: impl Iterator<Item = &()>) -> Option<&()> { x.next() }`
`19`	`19`	`LL + fn g(mut x: impl Iterator<Item = &()>) -> Option<()> { x.next() }`
`@@ -34,7 +34,7 @@ help: consider introducing a named lifetime parameter`
`34`	`34`	`\|`
`35`	`35`	`LL \| async fn i<'a>(mut x: impl Iterator<Item = &'a ()>) -> Option<&'a ()> { x.next() }`
`36`	`36`	`\| ++++ ~~~ ~~~`
`37`		`-help: ...or alternatively, to want to return an owned value`
	`37`	`+help: alternatively, you might want to return an owned value`
`38`	`38`	`\|`
`39`	`39`	`LL - async fn i(mut x: impl Iterator<Item = &()>) -> Option<&()> { x.next() }`
`40`	`40`	`LL + async fn i(mut x: impl Iterator<Item = &()>) -> Option<()> { x.next() }`
`@@ -79,7 +79,7 @@ help: consider introducing a named lifetime parameter`
`79`	`79`	`\|`
`80`	`80`	`LL \| fn g<'a>(mut x: impl Foo) -> Option<&'a ()> { x.next() }`
`81`	`81`	`\| ++++ ~~~`
`82`		`-help: ...or alternatively, to want to return an owned value`
	`82`	`+help: alternatively, you might want to return an owned value`
`83`	`83`	`\|`
`84`	`84`	`LL - fn g(mut x: impl Foo) -> Option<&()> { x.next() }`
`85`	`85`	`LL + fn g(mut x: impl Foo) -> Option<()> { x.next() }`
`@@ -100,7 +100,7 @@ help: consider introducing a named lifetime parameter`
`100`	`100`	`\|`
`101`	`101`	`LL \| fn g<'a>(mut x: impl Foo<()>) -> Option<&'a ()> { x.next() }`
`102`	`102`	`\| ++++ ~~~`
`103`		`-help: ...or alternatively, to want to return an owned value`
	`103`	`+help: alternatively, you might want to return an owned value`
`104`	`104`	`\|`
`105`	`105`	`LL - fn g(mut x: impl Foo<()>) -> Option<&()> { x.next() }`
`106`	`106`	`LL + fn g(mut x: impl Foo<()>) -> Option<()> { x.next() }`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ help: instead, you are more likely to want to change one of the arguments to be`
`44`	`44`	`\|`
`45`	`45`	`LL \| fn f2(a: &i32, b: &i32) -> &i32 { loop {} }`
`46`	`46`	`\| + +`
`47`		`-help: ...or alternatively, to want to return an owned value`
	`47`	`+help: ...or alternatively, you might want to return an owned value`
`48`	`48`	`\|`
`49`	`49`	`LL - fn f2(a: i32, b: i32) -> &i32 { loop {} }`
`50`	`50`	`LL + fn f2(a: i32, b: i32) -> i32 { loop {} }`