Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 49 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-21546.rs b/tests/ui/issues/issue-21546.rs
new file mode 100644
index 000000000..9f3974b43
--- /dev/null
+++ b/tests/ui/issues/issue-21546.rs
@@ -0,0 +1,49 @@
+// Also works as a test for #14564
+
+#[allow(non_snake_case)]
+mod Foo { }
+
+#[allow(dead_code)]
+struct Foo;
+//~^ ERROR the name `Foo` is defined multiple times
+
+#[allow(non_snake_case)]
+mod Bar { }
+
+#[allow(dead_code)]
+struct Bar(i32);
+//~^ ERROR the name `Bar` is defined multiple times
+
+
+#[allow(dead_code)]
+struct Baz(i32);
+
+#[allow(non_snake_case)]
+mod Baz { }
+//~^ ERROR the name `Baz` is defined multiple times
+
+
+#[allow(dead_code)]
+struct Qux { x: bool }
+
+#[allow(non_snake_case)]
+mod Qux { }
+//~^ ERROR the name `Qux` is defined multiple times
+
+
+#[allow(dead_code)]
+struct Quux;
+
+#[allow(non_snake_case)]
+mod Quux { }
+//~^ ERROR the name `Quux` is defined multiple times
+
+
+#[allow(dead_code)]
+enum Corge { A, B }
+
+#[allow(non_snake_case)]
+mod Corge { }
+//~^ ERROR the name `Corge` is defined multiple times
+
+fn main() { }