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/glob-shadowing.stderr | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/test/ui/imports/glob-shadowing.stderr

(limited to 'src/test/ui/imports/glob-shadowing.stderr')

diff --git a/src/test/ui/imports/glob-shadowing.stderr b/src/test/ui/imports/glob-shadowing.stderr
new file mode 100644
index 000000000..aff2eff68
--- /dev/null
+++ b/src/test/ui/imports/glob-shadowing.stderr
@@ -0,0 +1,54 @@
+error[E0659]: `env` is ambiguous
+  --> $DIR/glob-shadowing.rs:11:17
+   |
+LL |         let x = env!("PATH");
+   |                 ^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
+   = note: `env` could refer to a macro from prelude
+note: `env` could also refer to the macro imported here
+  --> $DIR/glob-shadowing.rs:9:9
+   |
+LL |     use m::*;
+   |         ^^^^
+   = help: consider adding an explicit import of `env` to disambiguate
+   = help: or use `self::env` to refer to this macro unambiguously
+
+error[E0659]: `env` is ambiguous
+  --> $DIR/glob-shadowing.rs:19:21
+   |
+LL |             let x = env!("PATH");
+   |                     ^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
+   = note: `env` could refer to a macro from prelude
+note: `env` could also refer to the macro imported here
+  --> $DIR/glob-shadowing.rs:17:13
+   |
+LL |         use m::*;
+   |             ^^^^
+   = help: consider adding an explicit import of `env` to disambiguate
+
+error[E0659]: `fenv` is ambiguous
+  --> $DIR/glob-shadowing.rs:29:21
+   |
+LL |             let x = fenv!();
+   |                     ^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
+note: `fenv` could refer to the macro imported here
+  --> $DIR/glob-shadowing.rs:27:13
+   |
+LL |         use m::*;
+   |             ^^^^
+   = help: consider adding an explicit import of `fenv` to disambiguate
+note: `fenv` could also refer to the macro defined here
+  --> $DIR/glob-shadowing.rs:25:5
+   |
+LL |     pub macro fenv($e: expr) { $e }
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::fenv` to refer to this macro unambiguously
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0659`.
-- 
cgit v1.2.3