merge struct similar_name test into the general test file

diff --git a/tests/compile-fail/non_expressive_names.rs b/tests/compile-fail/non_expressive_names.rs
index 61fe0067a274d969968e0fc15e7bd86a993f8d71..d959507bcb2b002584e05cc7831e44bf49c22a26 100644 (file)
--- a/tests/compile-fail/non_expressive_names.rs
+++ b/tests/compile-fail/non_expressive_names.rs
@@ -11,8 +11,15 @@
 //~| NOTE: lint level defined here
 //~| NOTE: lint level defined here
 //~| NOTE: lint level defined here
+//~| NOTE: lint level defined here
 #![allow(unused)]
 
+
+struct Foo {
+    apple: i32,
+    bpple: i32,
+}
+
 fn main() {
     let specter: i32;
     let spectre: i32;
@@ -90,6 +97,13 @@ fn main() {
     let rx_cake: i32;
 }
 
+fn foo() {
+    let Foo { apple, bpple } = unimplemented!();
+    let Foo { apple: spring, //~NOTE existing binding defined here
+        bpple: sprang } = unimplemented!(); //~ ERROR: name is too similar
+    //~^HELP for further information
+}
+
 #[derive(Clone, Debug)]
 enum MaybeInst {
     Split,

diff --git a/tests/compile-fail/non_expressive_names2.rs b/tests/compile-fail/non_expressive_names2.rs
deleted file mode 100644 (file)
index a0e5885..0000000
--- a/tests/compile-fail/non_expressive_names2.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-#![deny(clippy,similar_names)]
-#![allow(unused)]
-
-struct Foo {
-    apple: i32,
-    bpple: i32,
-}
-
-fn main() {
-    let Foo { apple, bpple } = unimplemented!();
-    let Foo { apple: spring, bpple: sprang } = unimplemented!(); //~ ERROR: name is too similar
-}