use proper words in help message for floating point

chenyukang · chenyukang · commit 89a51a1a483f · 2022-08-16T19:12:36.000+08:00
diff --git a/compiler/rustc_typeck/src/check/expr.rs b/compiler/rustc_typeck/src/check/expr.rs
@@ -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,
                     );
                 }
diff --git a/src/test/ui/attempted-access-non-fatal.stderr b/src/test/ui/attempted-access-non-fatal.stderr
@@ -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
diff --git a/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr b/src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.stderr
@@ -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;
    |       +

Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`16`	`16`	`LL \| let _ = 0.f;`
`17`	`17`	`\| ^`
`18`	`18`	`\|`
`19`		-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`
	`19`	+help: if intended to be a floating point literal, consider adding a `0` after the period and a `f32` suffix
`20`	`20`	`\|`
`21`	`21`	`LL \| let _ = 0.0f32;`
`22`	`22`	`\| ~~~~`
@@ -27,9 +27,9 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`27`	`27`	`LL \| let _ = 2.l;`
`28`	`28`	`\| ^`
`29`	`29`	`\|`
`30`		-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`
	`30`	+help: if intended to be a floating point literal, consider adding a `0` after the period and a `f64` suffix
`31`	`31`	`\|`
`32`		`-LL \| let _ = 2.0f32;`
	`32`	`+LL \| let _ = 2.0f64;`
`33`	`33`	`\| ~~~~`
`34`	`34`
`35`	`35`	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
`38`	`38`	`LL \| let _ = 12.F;`
`39`	`39`	`\| ^`
`40`	`40`	`\|`
`41`		-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`
	`41`	+help: if intended to be a floating point literal, consider adding a `0` after the period and a `f32` suffix
`42`	`42`	`\|`
`43`	`43`	`LL \| let _ = 12.0f32;`
`44`	`44`	`\| ~~~~`
@@ -49,9 +49,9 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`49`	`49`	`LL \| let _ = 34.L;`
`50`	`50`	`\| ^`
`51`	`51`	`\|`
`52`		-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`
	`52`	+help: if intended to be a floating point literal, consider adding a `0` after the period and a `f64` suffix
`53`	`53`	`\|`
`54`		`-LL \| let _ = 34.0f32;`
	`54`	`+LL \| let _ = 34.0f64;`
`55`	`55`	`\| ~~~~`
`56`	`56`
`57`	`57`	`error: aborting due to 6 previous errors`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`4`	`4`	`LL \| 2.e1;`
`5`	`5`	`\| ^^`
`6`	`6`	`\|`
`7`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`7`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`8`	`8`	`\|`
`9`	`9`	`LL \| 2.0e1;`
`10`	`10`	`\| +`
@@ -15,7 +15,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`15`	`15`	`LL \| 2.E1;`
`16`	`16`	`\| ^^`
`17`	`17`	`\|`
`18`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`18`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`19`	`19`	`\|`
`20`	`20`	`LL \| 2.0E1;`
`21`	`21`	`\| +`
@@ -26,7 +26,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`26`	`26`	`LL \| 2.f32;`
`27`	`27`	`\| ^^^`
`28`	`28`	`\|`
`29`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`29`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`30`	`30`	`\|`
`31`	`31`	`LL \| 2.0f32;`
`32`	`32`	`\| +`
@@ -37,7 +37,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`37`	`37`	`LL \| 2.f64;`
`38`	`38`	`\| ^^^`
`39`	`39`	`\|`
`40`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`40`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`41`	`41`	`\|`
`42`	`42`	`LL \| 2.0f64;`
`43`	`43`	`\| +`
@@ -48,7 +48,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`48`	`48`	`LL \| 2.e+12;`
`49`	`49`	`\| ^`
`50`	`50`	`\|`
`51`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`51`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`52`	`52`	`\|`
`53`	`53`	`LL \| 2.0e+12;`
`54`	`54`	`\| +`
@@ -59,7 +59,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`59`	`59`	`LL \| 2.e-12;`
`60`	`60`	`\| ^`
`61`	`61`	`\|`
`62`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`62`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`63`	`63`	`\|`
`64`	`64`	`LL \| 2.0e-12;`
`65`	`65`	`\| +`
@@ -70,7 +70,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
`70`	`70`	`LL \| 2.e1f32;`
`71`	`71`	`\| ^^^^^`
`72`	`72`	`\|`
`73`		-help: If the number is meant to be a floating point number, consider adding a `0` after the period
	`73`	+help: if intended to be a floating point literal, consider adding a `0` after the period
`74`	`74`	`\|`
`75`	`75`	`LL \| 2.0e1f32;`
`76`	`76`	`\| +`