Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/ui/imports/rfc-1560-warning-cycle.rs b/tests/ui/imports/rfc-1560-warning-cycle.rs
new file mode 100644
index 000000000..cfa7179fb
--- /dev/null
+++ b/tests/ui/imports/rfc-1560-warning-cycle.rs
@@ -0,0 +1,13 @@
+pub struct Foo;
+
+mod bar {
+    struct Foo;
+
+    mod baz {
+        use *;
+        use bar::*;
+        fn f(_: Foo) {} //~ ERROR `Foo` is ambiguous
+    }
+}
+
+fn main() {}