Rollup merge of #5420 - dtolnay:newret, r=flip1995

[rust.git] / tests / ui / float_cmp_const.stderr

diff --git a/tests/ui/float_cmp_const.stderr b/tests/ui/float_cmp_const.stderr
index 6367ec73c963083b41f7181c8f7cf869c020da4a..2dc43cf4e5fba7af2ca679baf9353c5bec044282 100644 (file)
--- a/tests/ui/float_cmp_const.stderr
+++ b/tests/ui/float_cmp_const.stderr
@@ -1,86 +1,86 @@
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:17:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:20:5
    |
-17 |     1f32 == ONE;
+LL |     1f32 == ONE;
    |     ^^^^^^^^^^^ help: consider comparing them within some error: `(1f32 - ONE).abs() < error`
    |
-   = note: `-D float-cmp-const` implied by `-D warnings`
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:17:5
+   = note: `-D clippy::float-cmp-const` implied by `-D warnings`
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:20:5
    |
-17 |     1f32 == ONE;
+LL |     1f32 == ONE;
    |     ^^^^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:18:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:21:5
    |
-18 |     TWO == ONE;
+LL |     TWO == ONE;
    |     ^^^^^^^^^^ help: consider comparing them within some error: `(TWO - ONE).abs() < error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:18:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:21:5
    |
-18 |     TWO == ONE;
+LL |     TWO == ONE;
    |     ^^^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:19:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:22:5
    |
-19 |     TWO != ONE;
-   |     ^^^^^^^^^^ help: consider comparing them within some error: `(TWO - ONE).abs() < error`
+LL |     TWO != ONE;
+   |     ^^^^^^^^^^ help: consider comparing them within some error: `(TWO - ONE).abs() > error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:19:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:22:5
    |
-19 |     TWO != ONE;
+LL |     TWO != ONE;
    |     ^^^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:20:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:23:5
    |
-20 |     ONE + ONE == TWO;
+LL |     ONE + ONE == TWO;
    |     ^^^^^^^^^^^^^^^^ help: consider comparing them within some error: `(ONE + ONE - TWO).abs() < error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:20:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:23:5
    |
-20 |     ONE + ONE == TWO;
+LL |     ONE + ONE == TWO;
    |     ^^^^^^^^^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:21:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:25:5
    |
-21 |     1 as f32 == ONE;
-   |     ^^^^^^^^^^^^^^^ help: consider comparing them within some error: `(1 as f32 - ONE).abs() < error`
+LL |     x as f32 == ONE;
+   |     ^^^^^^^^^^^^^^^ help: consider comparing them within some error: `(x as f32 - ONE).abs() < error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:21:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:25:5
    |
-21 |     1 as f32 == ONE;
+LL |     x as f32 == ONE;
    |     ^^^^^^^^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:24:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:28:5
    |
-24 |     v == ONE;
+LL |     v == ONE;
    |     ^^^^^^^^ help: consider comparing them within some error: `(v - ONE).abs() < error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:24:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:28:5
    |
-24 |     v == ONE;
+LL |     v == ONE;
    |     ^^^^^^^^
 
-error: strict comparison of f32 or f64 constant
-  --> $DIR/float_cmp_const.rs:25:5
+error: strict comparison of `f32` or `f64` constant
+  --> $DIR/float_cmp_const.rs:29:5
    |
-25 |     v != ONE;
-   |     ^^^^^^^^ help: consider comparing them within some error: `(v - ONE).abs() < error`
+LL |     v != ONE;
+   |     ^^^^^^^^ help: consider comparing them within some error: `(v - ONE).abs() > error`
    |
-note: std::f32::EPSILON and std::f64::EPSILON are available.
-  --> $DIR/float_cmp_const.rs:25:5
+note: `f32::EPSILON` and `f64::EPSILON` are available.
+  --> $DIR/float_cmp_const.rs:29:5
    |
-25 |     v != ONE;
+LL |     v != ONE;
    |     ^^^^^^^^
 
 error: aborting due to 7 previous errors