Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/lint/lint-non-camel-case-types.rs b/src/test/ui/lint/lint-non-camel-case-types.rs
deleted file mode 100644
index acd5c5df9..000000000
--- a/src/test/ui/lint/lint-non-camel-case-types.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-#![forbid(non_camel_case_types)]
-#![allow(dead_code)]
-
-struct ONE_TWO_THREE;
-//~^ ERROR type `ONE_TWO_THREE` should have an upper camel case name
-
-struct foo { //~ ERROR type `foo` should have an upper camel case name
-    bar: isize,
-}
-
-enum foo2 { //~ ERROR type `foo2` should have an upper camel case name
-    Bar
-}
-
-struct foo3 { //~ ERROR type `foo3` should have an upper camel case name
-    bar: isize
-}
-
-type foo4 = isize; //~ ERROR type `foo4` should have an upper camel case name
-
-enum Foo5 {
-    bar //~ ERROR variant `bar` should have an upper camel case name
-}
-
-trait foo6 { //~ ERROR trait `foo6` should have an upper camel case name
-    type foo7; //~ ERROR associated type `foo7` should have an upper camel case name
-    fn dummy(&self) { }
-}
-
-fn f<ty>(_: ty) {} //~ ERROR type parameter `ty` should have an upper camel case name
-
-#[repr(C)]
-struct foo7 {
-    bar: isize,
-}
-
-fn main() { }