Auto merge of #4478 - tsurai:master, r=flip1995

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

diff --git a/tests/ui/identity_op.stderr b/tests/ui/identity_op.stderr
index c1ce8d2ec4cd5c616aa620408d67ea3243acb985..4742877706acd6d360768c41dfbe4f0b8011d8c7 100644 (file)
--- a/tests/ui/identity_op.stderr
+++ b/tests/ui/identity_op.stderr
@@ -1,50 +1,52 @@
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:13:5
+  --> $DIR/identity_op.rs:16:5
    |
-13 |     x + 0;
+LL |     x + 0;
    |     ^^^^^
    |
-   = note: `-D identity-op` implied by `-D warnings`
+   = note: `-D clippy::identity-op` implied by `-D warnings`
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:14:5
+  --> $DIR/identity_op.rs:17:5
    |
-14 |     x + (1 - 1);
+LL |     x + (1 - 1);
    |     ^^^^^^^^^^^
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:16:5
+  --> $DIR/identity_op.rs:19:5
    |
-16 |     0 + x;
+LL |     0 + x;
    |     ^^^^^
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:19:5
+  --> $DIR/identity_op.rs:22:5
    |
-19 |     x | (0);
+LL |     x | (0);
    |     ^^^^^^^
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:22:5
+  --> $DIR/identity_op.rs:25:5
    |
-22 |     x * 1;
+LL |     x * 1;
    |     ^^^^^
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:23:5
+  --> $DIR/identity_op.rs:26:5
    |
-23 |     1 * x;
+LL |     1 * x;
    |     ^^^^^
 
 error: the operation is ineffective. Consider reducing it to `x`
-  --> $DIR/identity_op.rs:29:5
+  --> $DIR/identity_op.rs:32:5
    |
-29 |     -1 & x;
+LL |     -1 & x;
    |     ^^^^^^
 
 error: the operation is ineffective. Consider reducing it to `u`
-  --> $DIR/identity_op.rs:32:5
+  --> $DIR/identity_op.rs:35:5
    |
-32 |     u & 255;
+LL |     u & 255;
    |     ^^^^^^^
 
+error: aborting due to 8 previous errors
+