Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 43 insertions, 0 deletions

diff --git a/tests/ui/rust-2018/uniform-paths/macro-rules.rs b/tests/ui/rust-2018/uniform-paths/macro-rules.rs
new file mode 100644
index 000000000..2d9a6a9a9
--- /dev/null
+++ b/tests/ui/rust-2018/uniform-paths/macro-rules.rs
@@ -0,0 +1,43 @@
+// edition:2018
+
+#![feature(decl_macro)]
+
+mod m1 {
+    // Non-exported legacy macros are treated as `pub(crate)`.
+    macro_rules! legacy_macro { () => () }
+
+    use legacy_macro as _; // OK
+    pub(crate) use legacy_macro as _; // OK
+    pub use legacy_macro as _; //~ ERROR `legacy_macro` is only public within the crate, and cannot be re-exported outside
+}
+
+mod m2 {
+    macro_rules! legacy_macro { () => () }
+
+    #[allow(non_camel_case_types)]
+    type legacy_macro = u8;
+
+    // Legacy macro imports don't prevent names from other namespaces from being imported.
+    use legacy_macro as _; // OK
+}
+
+mod m3 {
+    macro legacy_macro() {}
+
+    fn f() {
+        macro_rules! legacy_macro { () => () }
+
+        // Legacy macro imports create ambiguities with other names in the same namespace.
+        use legacy_macro as _; //~ ERROR `legacy_macro` is ambiguous
+    }
+}
+
+mod exported {
+    // Exported legacy macros are treated as `pub`.
+    #[macro_export]
+    macro_rules! legacy_macro { () => () }
+
+    pub use legacy_macro as _; // OK
+}
+
+fn main() {}