Consolidate tests for non_camel_case_types

diff --git a/src/test/compile-fail/lint-non-camel-case-class.rs b/src/test/compile-fail/lint-non-camel-case-class.rs
deleted file mode 100644 (file)
index f11ebc0..0000000
--- a/src/test/compile-fail/lint-non-camel-case-class.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[forbid(non_camel_case_types)]
-struct foo { //~ ERROR type, variant, or trait must be camel case
-    bar: int,
-}
-
-fn main() {
-}

diff --git a/src/test/compile-fail/lint-non-camel-case-enum.rs b/src/test/compile-fail/lint-non-camel-case-enum.rs
deleted file mode 100644 (file)
index 3d6f133..0000000
--- a/src/test/compile-fail/lint-non-camel-case-enum.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[forbid(non_camel_case_types)]
-enum foo { //~ ERROR type, variant, or trait must be camel case
-    Bar
-}
-
-fn main() {
-}

diff --git a/src/test/compile-fail/lint-non-camel-case-struct.rs b/src/test/compile-fail/lint-non-camel-case-struct.rs
deleted file mode 100644 (file)
index c8895f2..0000000
--- a/src/test/compile-fail/lint-non-camel-case-struct.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[forbid(non_camel_case_types)]
-struct foo { //~ ERROR type, variant, or trait must be camel case
-    bar: int
-}
-
-fn main() {
-}

diff --git a/src/test/compile-fail/lint-non-camel-case-type.rs b/src/test/compile-fail/lint-non-camel-case-type.rs
deleted file mode 100644 (file)
index a288d37..0000000
--- a/src/test/compile-fail/lint-non-camel-case-type.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[forbid(non_camel_case_types)]
-type foo = int; //~ ERROR type, variant, or trait must be camel case
-
-fn main() {
-}

diff --git a/src/test/compile-fail/lint-non-camel-case-types.rs b/src/test/compile-fail/lint-non-camel-case-types.rs
new file mode 100644 (file)
index 0000000..04dc2ce
--- /dev/null
+++ b/src/test/compile-fail/lint-non-camel-case-types.rs
@@ -0,0 +1,24 @@
+#[forbid(non_camel_case_types)];
+
+struct foo { //~ ERROR type, variant, or trait must be camel case
+    bar: int,
+}
+
+enum foo2 { //~ ERROR type, variant, or trait must be camel case
+    Bar
+}
+
+struct foo3 { //~ ERROR type, variant, or trait must be camel case
+    bar: int
+}
+
+type foo4 = int; //~ ERROR type, variant, or trait must be camel case
+
+enum Foo5 {
+    bar //~ ERROR type, variant, or trait must be camel case
+}
+
+trait foo6 { //~ ERROR type, variant, or trait must be camel case
+}
+
+fn main() { }
\ No newline at end of file

diff --git a/src/test/compile-fail/lint-non-camel-case-variant.rs b/src/test/compile-fail/lint-non-camel-case-variant.rs
deleted file mode 100644 (file)
index 8d7258f..0000000
--- a/src/test/compile-fail/lint-non-camel-case-variant.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[forbid(non_camel_case_types)]
-enum Foo {
-    bar //~ ERROR type, variant, or trait must be camel case
-}
-
-fn main() {
-}