Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 33 deletions

diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.rs b/src/test/ui/macros/macro-path-prelude-shadowing.rs
deleted file mode 100644
index d71812000..000000000
--- a/src/test/ui/macros/macro-path-prelude-shadowing.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// aux-build:macro-in-other-crate.rs
-
-#![feature(decl_macro)]
-
-macro_rules! add_macro_expanded_things_to_macro_prelude {() => {
-    #[macro_use]
-    extern crate macro_in_other_crate;
-}}
-
-add_macro_expanded_things_to_macro_prelude!();
-
-mod m1 {
-    fn check() {
-        inline!(); // OK. Theoretically ambiguous, but we do not consider built-in attributes
-                   // as candidates for non-attribute macro invocations to avoid regressions
-                   // on stable channel
-    }
-}
-
-mod m2 {
-    pub mod std {
-        pub macro panic() {}
-    }
-}
-
-mod m3 {
-    use m2::*; // glob-import user-defined `std`
-    fn check() {
-        std::panic!(); //~ ERROR `std` is ambiguous
-    }
-}
-
-fn main() {}