diff --git a/tests/ui/non_expressive_names.rs b/tests/ui/non_expressive_names.rs index 649a5ecb812..8f8c110b9da 100644 --- a/tests/ui/non_expressive_names.rs +++ b/tests/ui/non_expressive_names.rs @@ -1,17 +1,6 @@ #![feature(plugin)] #![plugin(clippy)] #![deny(clippy,similar_names)] - - - - - - - - - - - #![allow(unused)] @@ -129,18 +118,15 @@ fn bla() { } { let e: i32; - } { let e: i32; - let f: i32; } match 5 { 1 => println!(""), e => panic!(), - } match 5 { 1 => println!(""), diff --git a/tests/ui/non_expressive_names.stderr b/tests/ui/non_expressive_names.stderr index c47f5a449a2..63fc607b802 100644 --- a/tests/ui/non_expressive_names.stderr +++ b/tests/ui/non_expressive_names.stderr @@ -1,7 +1,7 @@ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:29:9 + --> $DIR/non_expressive_names.rs:18:9 | -29 | let bpple: i32; +18 | let bpple: i32; | ^^^^^ | note: lint level defined here @@ -10,107 +10,107 @@ note: lint level defined here 3 | #![deny(clippy,similar_names)] | ^^^^^^^^^^^^^ note: existing binding defined here - --> $DIR/non_expressive_names.rs:27:9 + --> $DIR/non_expressive_names.rs:16:9 | -27 | let apple: i32; +16 | let apple: i32; | ^^^^^ help: separate the discriminating character by an underscore like: `b_pple` - --> $DIR/non_expressive_names.rs:29:9 + --> $DIR/non_expressive_names.rs:18:9 | -29 | let bpple: i32; +18 | let bpple: i32; | ^^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:31:9 + --> $DIR/non_expressive_names.rs:20:9 | -31 | let cpple: i32; +20 | let cpple: i32; | ^^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:27:9 + --> $DIR/non_expressive_names.rs:16:9 | -27 | let apple: i32; +16 | let apple: i32; | ^^^^^ help: separate the discriminating character by an underscore like: `c_pple` - --> $DIR/non_expressive_names.rs:31:9 + --> $DIR/non_expressive_names.rs:20:9 | -31 | let cpple: i32; +20 | let cpple: i32; | ^^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:56:9 + --> $DIR/non_expressive_names.rs:45:9 | -56 | let bluby: i32; +45 | let bluby: i32; | ^^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:55:9 + --> $DIR/non_expressive_names.rs:44:9 | -55 | let blubx: i32; +44 | let blubx: i32; | ^^^^^ help: separate the discriminating character by an underscore like: `blub_y` - --> $DIR/non_expressive_names.rs:56:9 + --> $DIR/non_expressive_names.rs:45:9 | -56 | let bluby: i32; +45 | let bluby: i32; | ^^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:61:9 + --> $DIR/non_expressive_names.rs:50:9 | -61 | let coke: i32; +50 | let coke: i32; | ^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:59:9 + --> $DIR/non_expressive_names.rs:48:9 | -59 | let cake: i32; +48 | let cake: i32; | ^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:79:9 + --> $DIR/non_expressive_names.rs:68:9 | -79 | let xyzeabc: i32; +68 | let xyzeabc: i32; | ^^^^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:77:9 + --> $DIR/non_expressive_names.rs:66:9 | -77 | let xyz1abc: i32; +66 | let xyz1abc: i32; | ^^^^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:83:9 + --> $DIR/non_expressive_names.rs:72:9 | -83 | let parsee: i32; +72 | let parsee: i32; | ^^^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:81:9 + --> $DIR/non_expressive_names.rs:70:9 | -81 | let parser: i32; +70 | let parser: i32; | ^^^^^^ help: separate the discriminating character by an underscore like: `parse_e` - --> $DIR/non_expressive_names.rs:83:9 + --> $DIR/non_expressive_names.rs:72:9 | -83 | let parsee: i32; +72 | let parsee: i32; | ^^^^^^ error: binding's name is too similar to existing binding - --> $DIR/non_expressive_names.rs:97:16 + --> $DIR/non_expressive_names.rs:86:16 | -97 | bpple: sprang } = unimplemented!(); +86 | bpple: sprang } = unimplemented!(); | ^^^^^^ | note: existing binding defined here - --> $DIR/non_expressive_names.rs:96:22 + --> $DIR/non_expressive_names.rs:85:22 | -96 | let Foo { apple: spring, +85 | let Foo { apple: spring, | ^^^^^^ error: 5th binding whose name is just one char - --> $DIR/non_expressive_names.rs:131:17 + --> $DIR/non_expressive_names.rs:120:17 | -131 | let e: i32; +120 | let e: i32; | ^ | = note: #[deny(many_single_char_names)] implied by #[deny(clippy)] @@ -121,25 +121,25 @@ note: lint level defined here | ^^^^^^ error: 5th binding whose name is just one char - --> $DIR/non_expressive_names.rs:135:17 + --> $DIR/non_expressive_names.rs:123:17 | -135 | let e: i32; +123 | let e: i32; | ^ | = note: #[deny(many_single_char_names)] implied by #[deny(clippy)] error: 6th binding whose name is just one char - --> $DIR/non_expressive_names.rs:137:17 + --> $DIR/non_expressive_names.rs:124:17 | -137 | let f: i32; +124 | let f: i32; | ^ | = note: #[deny(many_single_char_names)] implied by #[deny(clippy)] error: 5th binding whose name is just one char - --> $DIR/non_expressive_names.rs:142:13 + --> $DIR/non_expressive_names.rs:129:13 | -142 | e => panic!(), +129 | e => panic!(), | ^ | = note: #[deny(many_single_char_names)] implied by #[deny(clippy)]