From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/imports/macro-paths.stderr | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/test/ui/imports/macro-paths.stderr

(limited to 'src/test/ui/imports/macro-paths.stderr')

diff --git a/src/test/ui/imports/macro-paths.stderr b/src/test/ui/imports/macro-paths.stderr
new file mode 100644
index 000000000..5f113ce2b
--- /dev/null
+++ b/src/test/ui/imports/macro-paths.stderr
@@ -0,0 +1,43 @@
+error[E0659]: `bar` is ambiguous
+  --> $DIR/macro-paths.rs:13:5
+   |
+LL |     bar::m! {
+   |     ^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution
+note: `bar` could refer to the module defined here
+  --> $DIR/macro-paths.rs:14:9
+   |
+LL |         mod bar { pub use two_macros::m; }
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: `bar` could also refer to the module imported here
+  --> $DIR/macro-paths.rs:12:9
+   |
+LL |     use foo::*;
+   |         ^^^^^^
+   = help: consider adding an explicit import of `bar` to disambiguate
+
+error[E0659]: `baz` is ambiguous
+  --> $DIR/macro-paths.rs:23:5
+   |
+LL |     baz::m! {
+   |     ^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `baz` could refer to the module defined here
+  --> $DIR/macro-paths.rs:24:9
+   |
+LL |         mod baz { pub use two_macros::m; }
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: `baz` could also refer to the module defined here
+  --> $DIR/macro-paths.rs:18:1
+   |
+LL | / pub mod baz {
+LL | |     pub use two_macros::m;
+LL | | }
+   | |_^
+   = help: use `crate::baz` to refer to this module unambiguously
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0659`.
-- 
cgit v1.2.3