Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 52 insertions, 0 deletions

diff --git a/tests/ui/imports/shadow_builtin_macros.rs b/tests/ui/imports/shadow_builtin_macros.rs
new file mode 100644
index 000000000..02c27d5ce
--- /dev/null
+++ b/tests/ui/imports/shadow_builtin_macros.rs
@@ -0,0 +1,52 @@
+// aux-build:two_macros.rs
+
+mod foo {
+    extern crate two_macros;
+    pub use self::two_macros::m as panic;
+}
+
+mod m1 {
+    use foo::panic; // ok
+    fn f() { panic!(); }
+}
+
+mod m2 {
+    use foo::*;
+    fn f() { panic!(); } //~ ERROR ambiguous
+}
+
+mod m3 {
+    ::two_macros::m!(use foo::panic;);
+    fn f() { panic!(); } //~ ERROR ambiguous
+}
+
+mod m4 {
+    macro_rules! panic { () => {} } // ok
+    panic!();
+}
+
+mod m5 {
+    macro_rules! m { () => {
+        macro_rules! panic { () => {} }
+    } }
+    m!();
+    panic!(); //~ ERROR `panic` is ambiguous
+}
+
+#[macro_use(n)]
+extern crate two_macros;
+mod bar {
+    pub use two_macros::m as n;
+}
+
+mod m6 {
+    use bar::n; // ok
+    n!();
+}
+
+mod m7 {
+    use bar::*;
+    n!(); //~ ERROR ambiguous
+}
+
+fn main() {}