diff options
| -rw-r--r-- | compiler/rustc_hir_typeck/src/cast.rs | 11 | ||||
| -rw-r--r-- | tests/ui/cast/cast-to-slice.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/consts/const-eval/const-eval-overflow-4b.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/error-codes/E0604.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/error-codes/E0620.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/error-emitter/error-festival.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/issues/issue-17441.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/mismatched_types/cast-rfc0401.stderr | 2 |
9 files changed, 16 insertions, 13 deletions
diff --git a/compiler/rustc_hir_typeck/src/cast.rs b/compiler/rustc_hir_typeck/src/cast.rs index 3884691cbbd..e17cfc15a43 100644 --- a/compiler/rustc_hir_typeck/src/cast.rs +++ b/compiler/rustc_hir_typeck/src/cast.rs @@ -381,7 +381,7 @@ impl<'a, 'tcx> CastCheck<'tcx> { if self.expr_ty.is_numeric() { if self.expr_ty == fcx.tcx.types.u32 { err.multipart_suggestion( - "try `char::from_u32` instead", + "consider using `char::from_u32` instead", vec![ (self.expr_span.shrink_to_lo(), "char::from_u32(".to_string()), (self.expr_span.shrink_to_hi().to(self.cast_span), ")".to_string()), @@ -389,9 +389,12 @@ impl<'a, 'tcx> CastCheck<'tcx> { Applicability::MachineApplicable, ); } else if self.expr_ty == fcx.tcx.types.i8 { - err.span_help(self.span, "try casting from `u8` instead"); + err.span_help(self.span, "consider casting from `u8` instead"); } else { - err.span_help(self.span, "try `char::from_u32` instead (via a `u32`)"); + err.span_help( + self.span, + "consider using `char::from_u32` instead (via a `u32`)", + ); }; } err.emit(); @@ -643,7 +646,7 @@ impl<'a, 'tcx> CastCheck<'tcx> { let mtstr = mt.prefix_str(); err.span_suggestion_verbose( self.cast_span.shrink_to_lo(), - "try casting to a reference instead", + "consider casting to a reference instead", format!("&{mtstr}"), Applicability::MachineApplicable, ); diff --git a/tests/ui/cast/cast-to-slice.stderr b/tests/ui/cast/cast-to-slice.stderr index 1033f77ee0c..382ccc3d10c 100644 --- a/tests/ui/cast/cast-to-slice.stderr +++ b/tests/ui/cast/cast-to-slice.stderr @@ -4,7 +4,7 @@ error[E0620]: cast to unsized type: `&[u8]` as `[char]` LL | "example".as_bytes() as [char]; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -help: try casting to a reference instead +help: consider casting to a reference instead | LL | "example".as_bytes() as &[char]; | + @@ -15,7 +15,7 @@ error[E0620]: cast to unsized type: `&[u8]` as `[char]` LL | arr as [char]; | ^^^^^^^^^^^^^ | -help: try casting to a reference instead +help: consider casting to a reference instead | LL | arr as &[char]; | + diff --git a/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr index cc96055abeb..2803c3380d7 100644 --- a/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr +++ b/tests/ui/cast/cast-to-unsized-trait-object-suggestion.stderr @@ -4,7 +4,7 @@ error[E0620]: cast to unsized type: `&{integer}` as `dyn Send` LL | &1 as dyn Send; | ^^^^^^^^^^^^^^ | -help: try casting to a reference instead +help: consider casting to a reference instead | LL | &1 as &dyn Send; | + diff --git a/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr b/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr index 1a0832b8ba0..b996370ea3d 100644 --- a/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr +++ b/tests/ui/consts/const-eval/const-eval-overflow-4b.stderr @@ -23,7 +23,7 @@ error[E0604]: only `u8` can be cast as `char`, not `i8` LL | : [u32; 5i8 as char as usize] | ^^^^^^^^^^^ invalid cast | -help: try casting from `u8` instead +help: consider casting from `u8` instead --> $DIR/const-eval-overflow-4b.rs:24:13 | LL | : [u32; 5i8 as char as usize] diff --git a/tests/ui/error-codes/E0604.stderr b/tests/ui/error-codes/E0604.stderr index b949ed973cd..67bbb25958f 100644 --- a/tests/ui/error-codes/E0604.stderr +++ b/tests/ui/error-codes/E0604.stderr @@ -4,7 +4,7 @@ error[E0604]: only `u8` can be cast as `char`, not `u32` LL | 1u32 as char; | ^^^^^^^^^^^^ invalid cast | -help: try `char::from_u32` instead +help: consider using `char::from_u32` instead | LL - 1u32 as char; LL + char::from_u32(1u32); diff --git a/tests/ui/error-codes/E0620.stderr b/tests/ui/error-codes/E0620.stderr index b2efe02f3aa..696407c6f7e 100644 --- a/tests/ui/error-codes/E0620.stderr +++ b/tests/ui/error-codes/E0620.stderr @@ -4,7 +4,7 @@ error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]` LL | let _foo = &[1_usize, 2] as [usize]; | ^^^^^^^^^^^^^^^^^^^^^^^^ | -help: try casting to a reference instead +help: consider casting to a reference instead | LL | let _foo = &[1_usize, 2] as &[usize]; | + diff --git a/tests/ui/error-emitter/error-festival.stderr b/tests/ui/error-emitter/error-festival.stderr index d2afae69c07..6c661eb17a8 100644 --- a/tests/ui/error-emitter/error-festival.stderr +++ b/tests/ui/error-emitter/error-festival.stderr @@ -60,7 +60,7 @@ error[E0604]: only `u8` can be cast as `char`, not `u32` LL | 0u32 as char; | ^^^^^^^^^^^^ invalid cast | -help: try `char::from_u32` instead +help: consider using `char::from_u32` instead | LL - 0u32 as char; LL + char::from_u32(0u32); diff --git a/tests/ui/issues/issue-17441.stderr b/tests/ui/issues/issue-17441.stderr index c96b13d62dc..96aad879e24 100644 --- a/tests/ui/issues/issue-17441.stderr +++ b/tests/ui/issues/issue-17441.stderr @@ -4,7 +4,7 @@ error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]` LL | let _foo = &[1_usize, 2] as [usize]; | ^^^^^^^^^^^^^^^^^^^^^^^^ | -help: try casting to a reference instead +help: consider casting to a reference instead | LL | let _foo = &[1_usize, 2] as &[usize]; | + diff --git a/tests/ui/mismatched_types/cast-rfc0401.stderr b/tests/ui/mismatched_types/cast-rfc0401.stderr index eb95d659840..a188b7791fd 100644 --- a/tests/ui/mismatched_types/cast-rfc0401.stderr +++ b/tests/ui/mismatched_types/cast-rfc0401.stderr @@ -106,7 +106,7 @@ error[E0604]: only `u8` can be cast as `char`, not `u32` LL | let _ = 0x61u32 as char; | ^^^^^^^^^^^^^^^ invalid cast | -help: try `char::from_u32` instead +help: consider using `char::from_u32` instead | LL - let _ = 0x61u32 as char; LL + let _ = char::from_u32(0x61u32); |