Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-6936.rs b/tests/ui/issues/issue-6936.rs
new file mode 100644
index 000000000..26531bba9
--- /dev/null
+++ b/tests/ui/issues/issue-6936.rs
@@ -0,0 +1,34 @@
+struct T;
+
+mod t1 {
+    type Foo = ::T;
+    mod Foo {} //~ ERROR the name `Foo` is defined multiple times
+}
+
+mod t2 {
+    type Foo = ::T;
+    struct Foo; //~ ERROR the name `Foo` is defined multiple times
+}
+
+mod t3 {
+    type Foo = ::T;
+    enum Foo {} //~ ERROR the name `Foo` is defined multiple times
+}
+
+mod t4 {
+    type Foo = ::T;
+    fn Foo() {} // ok
+}
+
+mod t5 {
+    type Bar<T> = T;
+    mod Bar {} //~ ERROR the name `Bar` is defined multiple times
+}
+
+mod t6 {
+    type Foo = ::T;
+    impl Foo {} // ok
+}
+
+
+fn main() {}