tweak wording

estebank · estebank · commit 62aff3bbc754 · 2023-01-23T14:47:00.000Z
diff --git a/compiler/rustc_hir_typeck/src/demand.rs b/compiler/rustc_hir_typeck/src/demand.rs
@@ -735,7 +735,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             .must_apply_modulo_regions()
         {
             err.multipart_suggestion(
-                "you can rely on the implicit conversion that `?` does to transform the error type",
+                "use `?` to coerce and return an appropriate `Err`, and wrap the resulting value \
+                 in `Ok` so the expression remains of type `Result`",
                 vec![
                     (expr.span.shrink_to_lo(), "Ok(".to_string()),
                     (expr.span.shrink_to_hi(), "?)".to_string()),
diff --git a/tests/ui/type/type-check/coerce-result-return-value-2.stderr b/tests/ui/type/type-check/coerce-result-return-value-2.stderr
@@ -9,7 +9,7 @@ LL |         true => x,
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |         true => Ok(x?),
    |                 +++ ++
@@ -25,7 +25,7 @@ LL |         true => return x,
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |         true => return Ok(x?),
    |                        +++ ++
diff --git a/tests/ui/type/type-check/coerce-result-return-value.stderr b/tests/ui/type/type-check/coerce-result-return-value.stderr
@@ -8,7 +8,7 @@ LL |     x
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |     Ok(x?)
    |     +++ ++
@@ -23,7 +23,7 @@ LL |     return x;
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |     return Ok(x?);
    |            +++ ++
@@ -39,7 +39,7 @@ LL |         x
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |         Ok(x?)
    |         +++ ++
@@ -55,7 +55,7 @@ LL |         x
    |
    = note: expected enum `Result<_, B>`
               found enum `Result<_, A>`
-help: you can rely on the implicit conversion that `?` does to transform the error type
+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
    |
 LL |         Ok(x?)
    |         +++ ++

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| true => x,`
`9`	`9`	`\|`
`10`	`10`	= note: expected enum `Result<_, B>`
`11`	`11`	found enum `Result<_, A>`
`12`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`12`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`13`	`13`	`\|`
`14`	`14`	`LL \| true => Ok(x?),`
`15`	`15`	`\| +++ ++`
`@@ -25,7 +25,7 @@ LL \| true => return x,`
`25`	`25`	`\|`
`26`	`26`	= note: expected enum `Result<_, B>`
`27`	`27`	found enum `Result<_, A>`
`28`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`28`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`29`	`29`	`\|`
`30`	`30`	`LL \| true => return Ok(x?),`
`31`	`31`	`\| +++ ++`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| x`
`8`	`8`	`\|`
`9`	`9`	= note: expected enum `Result<_, B>`
`10`	`10`	found enum `Result<_, A>`
`11`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`11`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`12`	`12`	`\|`
`13`	`13`	`LL \| Ok(x?)`
`14`	`14`	`\| +++ ++`
`@@ -23,7 +23,7 @@ LL \| return x;`
`23`	`23`	`\|`
`24`	`24`	= note: expected enum `Result<_, B>`
`25`	`25`	found enum `Result<_, A>`
`26`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`26`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`27`	`27`	`\|`
`28`	`28`	`LL \| return Ok(x?);`
`29`	`29`	`\| +++ ++`
`@@ -39,7 +39,7 @@ LL \| x`
`39`	`39`	`\|`
`40`	`40`	= note: expected enum `Result<_, B>`
`41`	`41`	found enum `Result<_, A>`
`42`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`42`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`43`	`43`	`\|`
`44`	`44`	`LL \| Ok(x?)`
`45`	`45`	`\| +++ ++`
`@@ -55,7 +55,7 @@ LL \| x`
`55`	`55`	`\|`
`56`	`56`	= note: expected enum `Result<_, B>`
`57`	`57`	found enum `Result<_, A>`
`58`		-help: you can rely on the implicit conversion that `?` does to transform the error type
	`58`	+help: use `?` to coerce and return an appropriate `Err`, and wrap the resulting value in `Ok` so the expression remains of type `Result`
`59`	`59`	`\|`
`60`	`60`	`LL \| Ok(x?)`
`61`	`61`	`\| +++ ++`