Prefer new associated numeric consts in float error messages

Rustin170506 · Rustin170506 · commit 650e3cb1769d · 2020-10-27T14:14:08.000+08:00
diff --git a/compiler/rustc_lint/src/types.rs b/compiler/rustc_lint/src/types.rs
@@ -439,7 +439,7 @@ fn lint_literal<'tcx>(
                 cx.struct_span_lint(OVERFLOWING_LITERALS, e.span, |lint| {
                     lint.build(&format!("literal out of range for `{}`", t.name_str()))
                         .note(&format!(
-                            "the literal `{}` does not fit into the type `{}` and will be converted to `std::{}::INFINITY`",
+                            "the literal `{}` does not fit into the type `{}` and will be converted to `{}::INFINITY`",
                             cx.sess()
                                 .source_map()
                                 .span_to_snippet(lit.span)
diff --git a/src/test/ui/lint/lint-type-overflow2.stderr b/src/test/ui/lint/lint-type-overflow2.stderr
@@ -17,31 +17,31 @@ error: literal out of range for `f32`
 LL |     let x = -3.40282357e+38_f32;
    |              ^^^^^^^^^^^^^^^^^^
    |
-   = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `std::f32::INFINITY`
+   = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `f32::INFINITY`
 
 error: literal out of range for `f32`
   --> $DIR/lint-type-overflow2.rs:10:14
    |
 LL |     let x =  3.40282357e+38_f32;
    |              ^^^^^^^^^^^^^^^^^^
    |
-   = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `std::f32::INFINITY`
+   = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `f32::INFINITY`
 
 error: literal out of range for `f64`
   --> $DIR/lint-type-overflow2.rs:11:14
    |
 LL |     let x = -1.7976931348623159e+308_f64;
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `std::f64::INFINITY`
+   = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `f64::INFINITY`
 
 error: literal out of range for `f64`
   --> $DIR/lint-type-overflow2.rs:12:14
    |
 LL |     let x =  1.7976931348623159e+308_f64;
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `std::f64::INFINITY`
+   = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `f64::INFINITY`
 
 error: aborting due to 5 previous errors
 

Original file line number	Diff line number	Diff line change
@@ -17,31 +17,31 @@ error: literal out of range for `f32`
`17`	`17`	`LL \| let x = -3.40282357e+38_f32;`
`18`	`18`	`\| ^^^^^^^^^^^^^^^^^^`
`19`	`19`	`\|`
`20`		- = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `std::f32::INFINITY`
	`20`	+ = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `f32::INFINITY`
`21`	`21`
`22`	`22`	error: literal out of range for `f32`
`23`	`23`	`--> $DIR/lint-type-overflow2.rs:10:14`
`24`	`24`	`\|`
`25`	`25`	`LL \| let x = 3.40282357e+38_f32;`
`26`	`26`	`\| ^^^^^^^^^^^^^^^^^^`
`27`	`27`	`\|`
`28`		- = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `std::f32::INFINITY`
	`28`	+ = note: the literal `3.40282357e+38_f32` does not fit into the type `f32` and will be converted to `f32::INFINITY`
`29`	`29`
`30`	`30`	error: literal out of range for `f64`
`31`	`31`	`--> $DIR/lint-type-overflow2.rs:11:14`
`32`	`32`	`\|`
`33`	`33`	`LL \| let x = -1.7976931348623159e+308_f64;`
`34`	`34`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`35`	`35`	`\|`
`36`		- = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `std::f64::INFINITY`
	`36`	+ = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `f64::INFINITY`
`37`	`37`
`38`	`38`	error: literal out of range for `f64`
`39`	`39`	`--> $DIR/lint-type-overflow2.rs:12:14`
`40`	`40`	`\|`
`41`	`41`	`LL \| let x = 1.7976931348623159e+308_f64;`
`42`	`42`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`43`	`43`	`\|`
`44`		- = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `std::f64::INFINITY`
	`44`	+ = note: the literal `1.7976931348623159e+308_f64` does not fit into the type `f64` and will be converted to `f64::INFINITY`
`45`	`45`
`46`	`46`	`error: aborting due to 5 previous errors`
`47`	`47`