Auto merge of #7847 - mikerite:fix-7829, 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 15743828d8b561b521e05107c389cb4acaec7896..7d034117547caf87990d1c824b99b872471eefe8 100644 (file)
--- a/tests/ui/range_plus_minus_one.rs
+++ b/tests/ui/range_plus_minus_one.rs
@@ -1,44 +1,41 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// run-rustfix
 
-
-#![feature(tool_lints)]
+#![allow(unused_parens)]
 
 fn f() -> usize {
     42
 }
 
 #[warn(clippy::range_plus_one)]
+#[warn(clippy::range_minus_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(..);