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

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

diff --git a/tests/ui/range_plus_minus_one.stderr b/tests/ui/range_plus_minus_one.stderr
index 80dfcddbe05534f42c487d466665d845aff48d83..f72943a04f252af9b471324f225ed12a3d79fd4d 100644 (file)
--- a/tests/ui/range_plus_minus_one.stderr
+++ b/tests/ui/range_plus_minus_one.stderr
@@ -1,48 +1,60 @@
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:12:14
+  --> $DIR/range_plus_minus_one.rs:14:14
    |
-12 |     for _ in 0..3+1 { }
-   |              ^^^^^^ help: use: `0..=3`
+LL |     for _ in 0..3 + 1 {}
+   |              ^^^^^^^^ help: use: `0..=3`
    |
-   = note: `-D range-plus-one` implied by `-D warnings`
+   = note: `-D clippy::range-plus-one` implied by `-D warnings`
 
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:15:14
+  --> $DIR/range_plus_minus_one.rs:17:14
    |
-15 |     for _ in 0..1+5 { }
-   |              ^^^^^^ help: use: `0..=5`
+LL |     for _ in 0..1 + 5 {}
+   |              ^^^^^^^^ help: use: `0..=5`
 
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:18:14
+  --> $DIR/range_plus_minus_one.rs:20:14
    |
-18 |     for _ in 1..1+1 { }
-   |              ^^^^^^ help: use: `1..=1`
+LL |     for _ in 1..1 + 1 {}
+   |              ^^^^^^^^ help: use: `1..=1`
 
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:24:14
+  --> $DIR/range_plus_minus_one.rs:26:14
    |
-24 |     for _ in 0..(1+f()) { }
-   |              ^^^^^^^^^^ help: use: `0..=f()`
+LL |     for _ in 0..(1 + f()) {}
+   |              ^^^^^^^^^^^^ help: use: `0..=f()`
 
 error: an exclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:28:13
+  --> $DIR/range_plus_minus_one.rs:30:13
    |
-28 |     let _ = ..=11-1;
-   |             ^^^^^^^ help: use: `..11`
+LL |     let _ = ..=11 - 1;
+   |             ^^^^^^^^^ help: use: `..11`
    |
-   = note: `-D range-minus-one` implied by `-D warnings`
+   = note: `-D clippy::range-minus-one` implied by `-D warnings`
 
 error: an exclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:29:13
+  --> $DIR/range_plus_minus_one.rs:31:13
    |
-29 |     let _ = ..=(11-1);
-   |             ^^^^^^^^^ help: use: `..11`
+LL |     let _ = ..=(11 - 1);
+   |             ^^^^^^^^^^^ help: use: `..11`
 
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:30:13
+  --> $DIR/range_plus_minus_one.rs:32:13
+   |
+LL |     let _ = (1..11 + 1);
+   |             ^^^^^^^^^^^ help: use: `(1..=11)`
+
+error: an inclusive range would be more readable
+  --> $DIR/range_plus_minus_one.rs:33:13
+   |
+LL |     let _ = (f() + 1)..(f() + 1);
+   |             ^^^^^^^^^^^^^^^^^^^^ help: use: `((f() + 1)..=f())`
+
+error: an inclusive range would be more readable
+  --> $DIR/range_plus_minus_one.rs:37:14
    |
-30 |     let _ = (f()+1)..(f()+1);
-   |             ^^^^^^^^^^^^^^^^ help: use: `(f()+1)..=f()`
+LL |     for _ in 1..ONE + ONE {}
+   |              ^^^^^^^^^^^^ help: use: `1..=ONE`
 
-error: aborting due to 7 previous errors
+error: aborting due to 9 previous errors