squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

use proper words in help message for floating point

Browse source
This commit is contained in:
yukang 2022-08-16 19:12:36 +08:00
parent 84629a5ab1
commit 89a51a1a48
3 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
compiler/rustc_typeck/src/check/expr.rs
View file

@ -2184,10 +2184,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let suffix = chars.collect::<String>();
suffix.is_empty() || suffix == "f32" || suffix == "f64"
};
let is_likely_suffix = |fist_chars: &[char], field: &str| {
field.len() >= 1
&& field.to_lowercase().starts_with(fist_chars)
let maybe_partial_suffix = |field: &str| -> Option<&str> {
let first_chars = ['f', 'l'];
if field.len() >= 1
&& field.to_lowercase().starts_with(first_chars)
&& field[1..].chars().all(|c| c.is_ascii_digit())
{
if field.to_lowercase().starts_with(['f']) { Some("f32") } else { Some("f64") }
} else {
None
}
};
if let ty::Infer(ty::IntVar(_)) = expr_t.kind()
&& let ExprKind::Lit(Spanned {
@ -2196,19 +2202,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}) = base.kind
&& !base.span.from_expansion()
{
let msg = "If the number is meant to be a floating point number, consider adding a `0` after the period";
if is_valid_suffix(&field_name) {
err.span_suggestion_verbose(
field.span.shrink_to_lo(),
msg,
"if intended to be a floating point literal, consider adding a `0` after the period",
'0',
Applicability::MaybeIncorrect,
);
} else if is_likely_suffix(&['f', 'l'], &field_name) {
} else if let Some(correct_suffix) = maybe_partial_suffix(&field_name) {
err.span_suggestion_verbose(
field.span,
format!("{}, valid float format are `f32` and `f64`", msg),
"0f32",
format!("if intended to be a floating point literal, consider adding a `0` after the period and a `{correct_suffix}` suffix"),
format!("0{correct_suffix}"),
Applicability::MaybeIncorrect,
);
}

12
src/test/ui/attempted-access-non-fatal.stderr
View file

@ -16,7 +16,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | let _ = 0.f;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period, valid float format are `f32` and `f64`
help: if intended to be a floating point literal, consider adding a `0` after the period and a `f32` suffix
|
LL | let _ = 0.0f32;
| ~~~~
@ -27,9 +27,9 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | let _ = 2.l;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period, valid float format are `f32` and `f64`
help: if intended to be a floating point literal, consider adding a `0` after the period and a `f64` suffix
|
LL | let _ = 2.0f32;
LL | let _ = 2.0f64;
| ~~~~
error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
@ -38,7 +38,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | let _ = 12.F;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period, valid float format are `f32` and `f64`
help: if intended to be a floating point literal, consider adding a `0` after the period and a `f32` suffix
|
LL | let _ = 12.0f32;
| ~~~~
@ -49,9 +49,9 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | let _ = 34.L;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period, valid float format are `f32` and `f64`
help: if intended to be a floating point literal, consider adding a `0` after the period and a `f64` suffix
|
LL | let _ = 34.0f32;
LL | let _ = 34.0f64;
| ~~~~
error: aborting due to 6 previous errors

14
src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr
View file

@ -4,7 +4,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.e1;
| ^^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0e1;
| +
@ -15,7 +15,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.E1;
| ^^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0E1;
| +
@ -26,7 +26,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.f32;
| ^^^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0f32;
| +
@ -37,7 +37,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.f64;
| ^^^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0f64;
| +
@ -48,7 +48,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.e+12;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0e+12;
| +
@ -59,7 +59,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.e-12;
| ^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0e-12;
| +
@ -70,7 +70,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
LL | 2.e1f32;
| ^^^^^
|
help: If the number is meant to be a floating point number, consider adding a `0` after the period
help: if intended to be a floating point literal, consider adding a `0` after the period
|
LL | 2.0e1f32;
| +