From 0bef7b5f744b24136dc77a6478aee26e0abce33a Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 11 May 2016 17:01:34 +0200
Subject: [PATCH] merge struct similar_name test into the general test file

---
 tests/compile-fail/non_expressive_names.rs  | 14 ++++++++++++++
 tests/compile-fail/non_expressive_names2.rs | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 tests/compile-fail/non_expressive_names2.rs

diff --git a/tests/compile-fail/non_expressive_names.rs b/tests/compile-fail/non_expressive_names.rs
index 61fe0067a27..d959507bcb2 100644
--- 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
index a0e5885c539..00000000000
--- 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
-}