Rustup

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dd1fdbf09a1862b3e244ad85344e5d4b50fc795..970b458e2a8b0cbdc89f987e18f1d0fc25ce451e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.0.188
+* Rustup to *rustc 1.26.0-nightly (392645394 2018-03-15)*
+* New lint: [`while_immutable_condition`]
+
 ## 0.0.187
 * Rustup to *rustc 1.26.0-nightly (322d7f7b9 2018-02-25)*
 * New lints: [`redundant_field_names`], [`suspicious_arithmetic_impl`], [`suspicious_op_assign_impl`]
@@ -777,6 +781,7 @@ All notable changes to this project will be documented in this file.
 [`useless_transmute`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#useless_transmute
 [`useless_vec`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#useless_vec
 [`verbose_bit_mask`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#verbose_bit_mask
+[`while_immutable_condition`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#while_immutable_condition
 [`while_let_loop`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#while_let_loop
 [`while_let_on_iterator`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#while_let_on_iterator
 [`wrong_pub_self_convention`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#wrong_pub_self_convention

diff --git a/Cargo.toml b/Cargo.toml
index a256be6085b0037636c413cbd217029d7742659f..09eb34bf5fdb0adce175b8c38c98bc3ae56d2579 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.187"
+version = "0.0.188"
 authors = [
        "Manish Goregaokar <manishsmail@gmail.com>",
        "Andre Bogus <bogusandre@gmail.com>",
@@ -37,7 +37,7 @@ path = "src/driver.rs"
 
 [dependencies]
 # begin automatic update
-clippy_lints = { version = "0.0.187", path = "clippy_lints" }
+clippy_lints = { version = "0.0.188", path = "clippy_lints" }
 # end automatic update
 cargo_metadata = "0.5"
 regex = "0.2"

diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index f8c93c9d7edb0755354e8fb916aad229025d9771..38b4a0ea18c289049ce3cb585468e2e277a0fda2 100644 (file)
--- a/clippy_lints/Cargo.toml
+++ b/clippy_lints/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "clippy_lints"
 # begin automatic update
-version = "0.0.187"
+version = "0.0.188"
 # end automatic update
 authors = [
        "Manish Goregaokar <manishsmail@gmail.com>",

diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 0034e28fac2f70430ef2ca2c750de3621fa43539..5272fb0a48e830f7e0c68198ee33ee6bad692f17 100644 (file)
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -519,9 +519,9 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         loops::NEVER_LOOP,
         loops::REVERSE_RANGE_LOOP,
         loops::UNUSED_COLLECT,
+        loops::WHILE_IMMUTABLE_CONDITION,
         loops::WHILE_LET_LOOP,
         loops::WHILE_LET_ON_ITERATOR,
-        loops::WHILE_IMMUTABLE_CONDITION,
         map_clone::MAP_CLONE,
         matches::MATCH_AS_REF,
         matches::MATCH_BOOL,

diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs
index 0e9d8bdfefdec34ecce39502df088693890436d4..251f0c588e807d87d3f2d81bbb2b452ab1333747 100644 (file)
--- a/clippy_lints/src/types.rs
+++ b/clippy_lints/src/types.rs
@@ -531,7 +531,7 @@ fn is_questionmark_desugar_marked_call(expr: &Expr) -> bool {
 
 fn is_unit(ty: Ty) -> bool {
     match ty.sty {
-        ty::TyTuple(slice, _) if slice.is_empty() => true,
+        ty::TyTuple(slice) if slice.is_empty() => true,
         _ => false,
     }
 }

diff --git a/tests/ui/array_indexing.rs b/tests/ui/array_indexing.rs
index faafa9a7a0d25c7ae687e4b79c364b4bacc10940..a01600edac77a06d74891d62bf28486d8e71dd9e 100644 (file)
--- a/tests/ui/array_indexing.rs
+++ b/tests/ui/array_indexing.rs
@@ -1,4 +1,4 @@
-#![feature(inclusive_range_syntax, plugin)]
+#![feature(plugin)]
 
 
 #![warn(indexing_slicing)]

diff --git a/tests/ui/copies.rs b/tests/ui/copies.rs
index 0588c141103f3ea44c245cb960ac5041f816efe0..65a565c68ecab9e089a4aa7f2deb6777f6e65225 100644 (file)
--- a/tests/ui/copies.rs
+++ b/tests/ui/copies.rs
@@ -1,5 +1,3 @@
-#![feature(dotdoteq_in_patterns, inclusive_range_syntax)]
-
 #![allow(blacklisted_name, collapsible_if, cyclomatic_complexity, eq_op, needless_continue,
          needless_return, never_loop, no_effect, zero_divided_by_zero)]
 

diff --git a/tests/ui/copies.stderr b/tests/ui/copies.stderr
index 5faf41b51e33d914d2a285bc7d284b5440dd5356..cce63280ce12a88b0951e99a94604cc3c7ba4a1b 100644 (file)
--- a/tests/ui/copies.stderr
+++ b/tests/ui/copies.stderr
@@ -1,384 +1,384 @@
 error: this `if` has identical blocks
-  --> $DIR/copies.rs:31:10
+  --> $DIR/copies.rs:29:10
    |
-31 |       else { //~ ERROR same body as `if` block
+29 |       else { //~ ERROR same body as `if` block
    |  __________^
-32 | |         Foo { bar: 42 };
-33 | |         0..10;
-34 | |         ..;
+30 | |         Foo { bar: 42 };
+31 | |         0..10;
+32 | |         ..;
 ...  |
-38 | |         foo();
-39 | |     }
+36 | |         foo();
+37 | |     }
    | |_____^
    |
    = note: `-D if-same-then-else` implied by `-D warnings`
 note: same as this
-  --> $DIR/copies.rs:22:13
+  --> $DIR/copies.rs:20:13
    |
-22 |       if true {
+20 |       if true {
    |  _____________^
-23 | |         Foo { bar: 42 };
-24 | |         0..10;
-25 | |         ..;
+21 | |         Foo { bar: 42 };
+22 | |         0..10;
+23 | |         ..;
 ...  |
-29 | |         foo();
-30 | |     }
+27 | |         foo();
+28 | |     }
    | |_____^
 
 error: this `match` has identical arm bodies
-  --> $DIR/copies.rs:80:14
+  --> $DIR/copies.rs:78:14
    |
-80 |           _ => { //~ ERROR match arms have same body
+78 |           _ => { //~ ERROR match arms have same body
    |  ______________^
-81 | |             foo();
-82 | |             let mut a = 42 + [23].len() as i32;
-83 | |             if true {
+79 | |             foo();
+80 | |             let mut a = 42 + [23].len() as i32;
+81 | |             if true {
 ...  |
-87 | |             a
-88 | |         }
+85 | |             a
+86 | |         }
    | |_________^
    |
    = note: `-D match-same-arms` implied by `-D warnings`
 note: same as this
-  --> $DIR/copies.rs:71:15
+  --> $DIR/copies.rs:69:15
    |
-71 |           42 => {
+69 |           42 => {
    |  _______________^
-72 | |             foo();
-73 | |             let mut a = 42 + [23].len() as i32;
-74 | |             if true {
+70 | |             foo();
+71 | |             let mut a = 42 + [23].len() as i32;
+72 | |             if true {
 ...  |
-78 | |             a
-79 | |         }
+76 | |             a
+77 | |         }
    | |_________^
 note: `42` has the same arm body as the `_` wildcard, consider removing it`
-  --> $DIR/copies.rs:71:15
+  --> $DIR/copies.rs:69:15
    |
-71 |           42 => {
+69 |           42 => {
    |  _______________^
-72 | |             foo();
-73 | |             let mut a = 42 + [23].len() as i32;
-74 | |             if true {
+70 | |             foo();
+71 | |             let mut a = 42 + [23].len() as i32;
+72 | |             if true {
 ...  |
-78 | |             a
-79 | |         }
+76 | |             a
+77 | |         }
    | |_________^
 
 error: this `match` has identical arm bodies
-  --> $DIR/copies.rs:94:14
+  --> $DIR/copies.rs:92:14
    |
-94 |         _ => 0, //~ ERROR match arms have same body
+92 |         _ => 0, //~ ERROR match arms have same body
    |              ^
    |
 note: same as this
-  --> $DIR/copies.rs:92:19
+  --> $DIR/copies.rs:90:19
    |
-92 |         Abc::A => 0,
+90 |         Abc::A => 0,
    |                   ^
 note: `Abc::A` has the same arm body as the `_` wildcard, consider removing it`
-  --> $DIR/copies.rs:92:19
+  --> $DIR/copies.rs:90:19
    |
-92 |         Abc::A => 0,
+90 |         Abc::A => 0,
    |                   ^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:104:10
+   --> $DIR/copies.rs:102:10
     |
-104 |       else { //~ ERROR same body as `if` block
+102 |       else { //~ ERROR same body as `if` block
     |  __________^
-105 | |         42
-106 | |     };
+103 | |         42
+104 | |     };
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:101:21
+   --> $DIR/copies.rs:99:21
     |
-101 |       let _ = if true {
+99  |       let _ = if true {
     |  _____________________^
-102 | |         42
-103 | |     }
+100 | |         42
+101 | |     }
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:118:10
+   --> $DIR/copies.rs:116:10
     |
-118 |       else { //~ ERROR same body as `if` block
+116 |       else { //~ ERROR same body as `if` block
     |  __________^
-119 | |         for _ in &[42] {
-120 | |             let foo: &Option<_> = &Some::<u8>(42);
-121 | |             if true {
+117 | |         for _ in &[42] {
+118 | |             let foo: &Option<_> = &Some::<u8>(42);
+119 | |             if true {
 ...   |
-126 | |         }
-127 | |     }
+124 | |         }
+125 | |     }
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:108:13
+   --> $DIR/copies.rs:106:13
     |
-108 |       if true {
+106 |       if true {
     |  _____________^
-109 | |         for _ in &[42] {
-110 | |             let foo: &Option<_> = &Some::<u8>(42);
-111 | |             if true {
+107 | |         for _ in &[42] {
+108 | |             let foo: &Option<_> = &Some::<u8>(42);
+109 | |             if true {
 ...   |
-116 | |         }
-117 | |     }
+114 | |         }
+115 | |     }
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:140:10
+   --> $DIR/copies.rs:138:10
     |
-140 |       else { //~ ERROR same body as `if` block
+138 |       else { //~ ERROR same body as `if` block
     |  __________^
-141 | |         let bar = if true {
-142 | |             42
-143 | |         }
+139 | |         let bar = if true {
+140 | |             42
+141 | |         }
 ...   |
-149 | |         bar + 1;
-150 | |     }
+147 | |         bar + 1;
+148 | |     }
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:129:13
+   --> $DIR/copies.rs:127:13
     |
-129 |       if true {
+127 |       if true {
     |  _____________^
-130 | |         let bar = if true {
-131 | |             42
-132 | |         }
+128 | |         let bar = if true {
+129 | |             42
+130 | |         }
 ...   |
-138 | |         bar + 1;
-139 | |     }
+136 | |         bar + 1;
+137 | |     }
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:175:10
+   --> $DIR/copies.rs:173:10
     |
-175 |       else { //~ ERROR same body as `if` block
+173 |       else { //~ ERROR same body as `if` block
     |  __________^
-176 | |         if let Some(a) = Some(42) {}
-177 | |     }
+174 | |         if let Some(a) = Some(42) {}
+175 | |     }
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:172:13
+   --> $DIR/copies.rs:170:13
     |
-172 |       if true {
+170 |       if true {
     |  _____________^
-173 | |         if let Some(a) = Some(42) {}
-174 | |     }
+171 | |         if let Some(a) = Some(42) {}
+172 | |     }
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:182:10
+   --> $DIR/copies.rs:180:10
     |
-182 |       else { //~ ERROR same body as `if` block
+180 |       else { //~ ERROR same body as `if` block
     |  __________^
-183 | |         if let (1, .., 3) = (1, 2, 3) {}
-184 | |     }
+181 | |         if let (1, .., 3) = (1, 2, 3) {}
+182 | |     }
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:179:13
+   --> $DIR/copies.rs:177:13
     |
-179 |       if true {
+177 |       if true {
     |  _____________^
-180 | |         if let (1, .., 3) = (1, 2, 3) {}
-181 | |     }
+178 | |         if let (1, .., 3) = (1, 2, 3) {}
+179 | |     }
     | |_____^
 
 error: this `match` has identical arm bodies
-   --> $DIR/copies.rs:237:15
+   --> $DIR/copies.rs:235:15
     |
-237 |         51 => foo(), //~ ERROR match arms have same body
+235 |         51 => foo(), //~ ERROR match arms have same body
     |               ^^^^^
     |
 note: same as this
-   --> $DIR/copies.rs:236:15
+   --> $DIR/copies.rs:234:15
     |
-236 |         42 => foo(),
+234 |         42 => foo(),
     |               ^^^^^
 note: consider refactoring into `42 | 51`
-   --> $DIR/copies.rs:236:15
+   --> $DIR/copies.rs:234:15
     |
-236 |         42 => foo(),
+234 |         42 => foo(),
     |               ^^^^^
 
 error: this `match` has identical arm bodies
-   --> $DIR/copies.rs:243:17
+   --> $DIR/copies.rs:241:17
     |
-243 |         None => 24, //~ ERROR match arms have same body
+241 |         None => 24, //~ ERROR match arms have same body
     |                 ^^
     |
 note: same as this
-   --> $DIR/copies.rs:242:20
+   --> $DIR/copies.rs:240:20
     |
-242 |         Some(_) => 24,
+240 |         Some(_) => 24,
     |                    ^^
 note: consider refactoring into `Some(_) | None`
-   --> $DIR/copies.rs:242:20
+   --> $DIR/copies.rs:240:20
     |
-242 |         Some(_) => 24,
+240 |         Some(_) => 24,
     |                    ^^
 
 error: this `match` has identical arm bodies
-   --> $DIR/copies.rs:265:28
+   --> $DIR/copies.rs:263:28
     |
-265 |         (None, Some(a)) => bar(a), //~ ERROR match arms have same body
+263 |         (None, Some(a)) => bar(a), //~ ERROR match arms have same body
     |                            ^^^^^^
     |
 note: same as this
-   --> $DIR/copies.rs:264:28
+   --> $DIR/copies.rs:262:28
     |
-264 |         (Some(a), None) => bar(a),
+262 |         (Some(a), None) => bar(a),
     |                            ^^^^^^
 note: consider refactoring into `(Some(a), None) | (None, Some(a))`
-   --> $DIR/copies.rs:264:28
+   --> $DIR/copies.rs:262:28
     |
-264 |         (Some(a), None) => bar(a),
+262 |         (Some(a), None) => bar(a),
     |                            ^^^^^^
 
 error: this `match` has identical arm bodies
-   --> $DIR/copies.rs:271:26
+   --> $DIR/copies.rs:269:26
     |
-271 |         (.., Some(a)) => bar(a), //~ ERROR match arms have same body
+269 |         (.., Some(a)) => bar(a), //~ ERROR match arms have same body
     |                          ^^^^^^
     |
 note: same as this
-   --> $DIR/copies.rs:270:26
+   --> $DIR/copies.rs:268:26
     |
-270 |         (Some(a), ..) => bar(a),
+268 |         (Some(a), ..) => bar(a),
     |                          ^^^^^^
 note: consider refactoring into `(Some(a), ..) | (.., Some(a))`
-   --> $DIR/copies.rs:270:26
+   --> $DIR/copies.rs:268:26
     |
-270 |         (Some(a), ..) => bar(a),
+268 |         (Some(a), ..) => bar(a),
     |                          ^^^^^^
 
 error: this `match` has identical arm bodies
-   --> $DIR/copies.rs:277:20
+   --> $DIR/copies.rs:275:20
     |
-277 |         (.., 3) => 42, //~ ERROR match arms have same body
+275 |         (.., 3) => 42, //~ ERROR match arms have same body
     |                    ^^
     |
 note: same as this
-   --> $DIR/copies.rs:276:23
+   --> $DIR/copies.rs:274:23
     |
-276 |         (1, .., 3) => 42,
+274 |         (1, .., 3) => 42,
     |                       ^^
 note: consider refactoring into `(1, .., 3) | (.., 3)`
-   --> $DIR/copies.rs:276:23
+   --> $DIR/copies.rs:274:23
     |
-276 |         (1, .., 3) => 42,
+274 |         (1, .., 3) => 42,
     |                       ^^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:283:12
+   --> $DIR/copies.rs:281:12
     |
-283 |       } else { //~ ERROR same body as `if` block
+281 |       } else { //~ ERROR same body as `if` block
     |  ____________^
-284 | |         0.0
-285 | |     };
+282 | |         0.0
+283 | |     };
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:281:21
+   --> $DIR/copies.rs:279:21
     |
-281 |       let _ = if true {
+279 |       let _ = if true {
     |  _____________________^
-282 | |         0.0
-283 | |     } else { //~ ERROR same body as `if` block
+280 | |         0.0
+281 | |     } else { //~ ERROR same body as `if` block
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:289:12
+   --> $DIR/copies.rs:287:12
     |
-289 |       } else { //~ ERROR same body as `if` block
+287 |       } else { //~ ERROR same body as `if` block
     |  ____________^
-290 | |         -0.0
-291 | |     };
+288 | |         -0.0
+289 | |     };
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:287:21
+   --> $DIR/copies.rs:285:21
     |
-287 |       let _ = if true {
+285 |       let _ = if true {
     |  _____________________^
-288 | |         -0.0
-289 | |     } else { //~ ERROR same body as `if` block
+286 | |         -0.0
+287 | |     } else { //~ ERROR same body as `if` block
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:309:12
+   --> $DIR/copies.rs:307:12
     |
-309 |       } else { //~ ERROR same body as `if` block
+307 |       } else { //~ ERROR same body as `if` block
     |  ____________^
-310 | |         std::f32::NAN
-311 | |     };
+308 | |         std::f32::NAN
+309 | |     };
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:307:21
+   --> $DIR/copies.rs:305:21
     |
-307 |       let _ = if true {
+305 |       let _ = if true {
     |  _____________________^
-308 | |         std::f32::NAN
-309 | |     } else { //~ ERROR same body as `if` block
+306 | |         std::f32::NAN
+307 | |     } else { //~ ERROR same body as `if` block
     | |_____^
 
 error: this `if` has identical blocks
-   --> $DIR/copies.rs:327:10
+   --> $DIR/copies.rs:325:10
     |
-327 |       else { //~ ERROR same body as `if` block
+325 |       else { //~ ERROR same body as `if` block
     |  __________^
-328 | |         try!(Ok("foo"));
-329 | |     }
+326 | |         try!(Ok("foo"));
+327 | |     }
     | |_____^
     |
 note: same as this
-   --> $DIR/copies.rs:324:13
+   --> $DIR/copies.rs:322:13
     |
-324 |       if true {
+322 |       if true {
     |  _____________^
-325 | |         try!(Ok("foo"));
-326 | |     }
+323 | |         try!(Ok("foo"));
+324 | |     }
     | |_____^
 
 error: this `if` has the same condition as a previous if
-   --> $DIR/copies.rs:353:13
+   --> $DIR/copies.rs:351:13
     |
-353 |     else if b { //~ ERROR ifs same condition
+351 |     else if b { //~ ERROR ifs same condition
     |             ^
     |
     = note: `-D ifs-same-cond` implied by `-D warnings`
 note: same as this
-   --> $DIR/copies.rs:351:8
+   --> $DIR/copies.rs:349:8
     |
-351 |     if b {
+349 |     if b {
     |        ^
 
 error: this `if` has the same condition as a previous if
-   --> $DIR/copies.rs:358:13
+   --> $DIR/copies.rs:356:13
     |
-358 |     else if a == 1 { //~ ERROR ifs same condition
+356 |     else if a == 1 { //~ ERROR ifs same condition
     |             ^^^^^^
     |
 note: same as this
-   --> $DIR/copies.rs:356:8
+   --> $DIR/copies.rs:354:8
     |
-356 |     if a == 1 {
+354 |     if a == 1 {
     |        ^^^^^^
 
 error: this `if` has the same condition as a previous if
-   --> $DIR/copies.rs:365:13
+   --> $DIR/copies.rs:363:13
     |
-365 |     else if 2*a == 1 { //~ ERROR ifs same condition
+363 |     else if 2*a == 1 { //~ ERROR ifs same condition
     |             ^^^^^^^^
     |
 note: same as this
-   --> $DIR/copies.rs:361:8
+   --> $DIR/copies.rs:359:8
     |
-361 |     if 2*a == 1 {
+359 |     if 2*a == 1 {
     |        ^^^^^^^^
 
 error: aborting due to 20 previous errors

diff --git a/tests/ui/for_loop.rs b/tests/ui/for_loop.rs
index 92f95e09d73efa9039eb3b97fc300d71f281b413..0a8be4d938b1a3a5c1ab4694c33a57d947eadf4b 100644 (file)
--- a/tests/ui/for_loop.rs
+++ b/tests/ui/for_loop.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, inclusive_range_syntax, custom_attribute)]
+#![feature(plugin, custom_attribute)]
 
 
 use std::collections::*;

diff --git a/tests/ui/no_effect.rs b/tests/ui/no_effect.rs
index a782063e3919d2af20030e28c9376c3d667f779f..d1e4bf2a2c743cffaf5b603f2e1daced2172d632 100644 (file)
--- a/tests/ui/no_effect.rs
+++ b/tests/ui/no_effect.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, box_syntax, inclusive_range_syntax)]
+#![feature(plugin, box_syntax)]
 
 
 #![warn(no_effect, unnecessary_operation)]

diff --git a/tests/ui/range.rs b/tests/ui/range.rs
index d9db28c8513f4a9077bcdd710e498b500ab7b0db..611a324f6e3c5fcc719695ac582e1d34a15bc62e 100644 (file)
--- a/tests/ui/range.rs
+++ b/tests/ui/range.rs
@@ -1,7 +1,4 @@
 #![feature(iterator_step_by)]
-#![feature(inclusive_range_syntax)]
-
-
 
 struct NotARange;
 impl NotARange {

diff --git a/tests/ui/range.stderr b/tests/ui/range.stderr
index fc51f1a07f07741d2dfa559606622cc4b52dd930..064429c337c86a336e67ce5ccd80e26777fbdc12 100644 (file)
--- a/tests/ui/range.stderr
+++ b/tests/ui/range.stderr
@@ -1,41 +1,41 @@
 error: Iterator::step_by(0) will panic at runtime
-  --> $DIR/range.rs:13:13
+  --> $DIR/range.rs:10:13
    |
-13 |     let _ = (0..1).step_by(0);
+10 |     let _ = (0..1).step_by(0);
    |             ^^^^^^^^^^^^^^^^^
    |
    = note: `-D iterator-step-by-zero` implied by `-D warnings`
 
 error: Iterator::step_by(0) will panic at runtime
-  --> $DIR/range.rs:17:13
+  --> $DIR/range.rs:14:13
    |
-17 |     let _ = (1..).step_by(0);
+14 |     let _ = (1..).step_by(0);
    |             ^^^^^^^^^^^^^^^^
 
 error: Iterator::step_by(0) will panic at runtime
-  --> $DIR/range.rs:18:13
+  --> $DIR/range.rs:15:13
    |
-18 |     let _ = (1..=2).step_by(0);
+15 |     let _ = (1..=2).step_by(0);
    |             ^^^^^^^^^^^^^^^^^^
 
 error: Iterator::step_by(0) will panic at runtime
-  --> $DIR/range.rs:21:13
+  --> $DIR/range.rs:18:13
    |
-21 |     let _ = x.step_by(0);
+18 |     let _ = x.step_by(0);
    |             ^^^^^^^^^^^^
 
 error: It is more idiomatic to use v1.iter().enumerate()
-  --> $DIR/range.rs:29:14
+  --> $DIR/range.rs:26:14
    |
-29 |     let _x = v1.iter().zip(0..v1.len());
+26 |     let _x = v1.iter().zip(0..v1.len());
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D range-zip-with-len` implied by `-D warnings`
 
 error: Iterator::step_by(0) will panic at runtime
-  --> $DIR/range.rs:33:13
+  --> $DIR/range.rs:30:13
    |
-33 |     let _ = v1.iter().step_by(2/3);
+30 |     let _ = v1.iter().step_by(2/3);
    |             ^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 6 previous errors

diff --git a/tests/ui/range_plus_minus_one.rs b/tests/ui/range_plus_minus_one.rs
index dce81634876fb195cb543b1fd757aff92c953b8a..31574a4aeed6fe582f10039c745db3128ecd64e1 100644 (file)
--- a/tests/ui/range_plus_minus_one.rs
+++ b/tests/ui/range_plus_minus_one.rs
@@ -1,5 +1,3 @@
-#![feature(inclusive_range_syntax)]
-
 fn f() -> usize {
     42
 }

diff --git a/tests/ui/range_plus_minus_one.stderr b/tests/ui/range_plus_minus_one.stderr
index 80dfcddbe05534f42c487d466665d845aff48d83..1990300ef90477eca5cedc5449ba57ae08adeb0c 100644 (file)
--- a/tests/ui/range_plus_minus_one.stderr
+++ b/tests/ui/range_plus_minus_one.stderr
@@ -1,47 +1,47 @@
 error: an inclusive range would be more readable
-  --> $DIR/range_plus_minus_one.rs:12:14
+  --> $DIR/range_plus_minus_one.rs:10:14
    |
-12 |     for _ in 0..3+1 { }
+10 |     for _ in 0..3+1 { }
    |              ^^^^^^ help: use: `0..=3`
    |
    = note: `-D 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:13:14
    |
-15 |     for _ in 0..1+5 { }
+13 |     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:16:14
    |
-18 |     for _ in 1..1+1 { }
+16 |     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:22:14
    |
-24 |     for _ in 0..(1+f()) { }
+22 |     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:26:13
    |
-28 |     let _ = ..=11-1;
+26 |     let _ = ..=11-1;
    |             ^^^^^^^ help: use: `..11`
    |
    = note: `-D 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:27:13
    |
-29 |     let _ = ..=(11-1);
+27 |     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:28:13
    |
-30 |     let _ = (f()+1)..(f()+1);
+28 |     let _ = (f()+1)..(f()+1);
    |             ^^^^^^^^^^^^^^^^ help: use: `(f()+1)..=f()`
 
 error: aborting due to 7 previous errors

diff --git a/tests/ui/redundant_field_names.rs b/tests/ui/redundant_field_names.rs
index 98b6e16c450c4d28cf6b060982045a107c5b68ed..a14f0ef40a04a8a46cc392423157b829f9cf13a3 100644 (file)
--- a/tests/ui/redundant_field_names.rs
+++ b/tests/ui/redundant_field_names.rs
@@ -1,6 +1,6 @@
 #![warn(redundant_field_names)]
 #![allow(unused_variables)]
-#![feature(inclusive_range, inclusive_range_syntax)]
+#![feature(inclusive_range, inclusive_range_fields)]
 
 #[macro_use]
 extern crate derive_new;