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

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

diff --git a/tests/ui/range_plus_minus_one.rs b/tests/ui/range_plus_minus_one.rs
index 1ee3637f266d7654eda12f7ebcc2ef476bd533f7..3cfed4125b35c7434dda2950b72e243cbed6e2d5 100644 (file)
--- a/tests/ui/range_plus_minus_one.rs
+++ b/tests/ui/range_plus_minus_one.rs
@@ -1,4 +1,6 @@
-#![feature(tool_lints)]
+// run-rustfix
+
+#![allow(unused_parens)]
 
 fn f() -> usize {
     42
@@ -6,29 +8,33 @@ fn f() -> usize {
 
 #[warn(clippy::range_plus_one)]
 fn main() {
-    for _ in 0..2 { }
-    for _ in 0..=2 { }
+    for _ in 0..2 {}
+    for _ in 0..=2 {}
+
+    for _ in 0..3 + 1 {}
+    for _ in 0..=3 + 1 {}
 
-    for _ in 0..3+1 { }
-    for _ in 0..=3+1 { }
+    for _ in 0..1 + 5 {}
+    for _ in 0..=1 + 5 {}
 
-    for _ in 0..1+5 { }
-    for _ in 0..=1+5 { }
+    for _ in 1..1 + 1 {}
+    for _ in 1..=1 + 1 {}
 
-    for _ in 1..1+1 { }
-    for _ in 1..=1+1 { }
+    for _ in 0..13 + 13 {}
+    for _ in 0..=13 - 7 {}
 
-    for _ in 0..13+13 { }
-    for _ in 0..=13-7 { }
+    for _ in 0..(1 + f()) {}
+    for _ in 0..=(1 + f()) {}
 
-    for _ in 0..(1+f()) { }
-    for _ in 0..=(1+f()) { }
+    let _ = ..11 - 1;
+    let _ = ..=11 - 1;
+    let _ = ..=(11 - 1);
+    let _ = (1..11 + 1);
+    let _ = (f() + 1)..(f() + 1);
 
-    let _ = ..11-1;
-    let _ = ..=11-1;
-    let _ = ..=(11-1);
-    let _ = (1..11+1);
-    let _ = (f()+1)..(f()+1);
+    const ONE: usize = 1;
+    // integer consts are linted, too
+    for _ in 1..ONE + ONE {}
 
     let mut vec: Vec<()> = std::vec::Vec::new();
     vec.drain(..);