Explicitly export core and std macros

compiler/rustc_builtin_macros/src/standard_library_imports.rs

@@ -43,7 +43,7 @@ pub fn inject(
 
     let item = cx.item(
         span,
-        thin_vec![cx.attr_word(sym::macro_use, span)],
+        ast::AttrVec::new(),
         ast::ItemKind::ExternCrate(None, Ident::new(name, ident_span)),
     );
 

library/alloctests/lib.rs

@@ -52,6 +52,7 @@
 #![feature(negative_impls)]
 #![feature(never_type)]
 #![feature(optimize_attribute)]
+#![feature(prelude_import)]
 #![feature(rustc_allow_const_fn_unstable)]
 #![feature(rustc_attrs)]
 #![feature(staged_api)]
@@ -61,11 +62,17 @@
 
 // Allow testing this library
 extern crate alloc as realalloc;
-#[macro_use]
+
+// This is needed to provide macros to the directly imported alloc modules below.
 extern crate std;
+#[prelude_import]
+#[allow(unused_imports)]
+use std::prelude::rust_2024::*;
+
 #[cfg(test)]
 extern crate test;
 mod testing;
+
 use realalloc::*;
 
 // We are directly including collections and raw_vec here as both use non-public
@@ -86,8 +93,7 @@ pub(crate) mod test_helpers {
         let mut hasher = std::hash::RandomState::new().build_hasher();
         std::panic::Location::caller().hash(&mut hasher);
         let hc64 = hasher.finish();
-        let seed_vec =
-            hc64.to_le_bytes().into_iter().chain(0u8..8).collect::<crate::vec::Vec<u8>>();
+        let seed_vec = hc64.to_le_bytes().into_iter().chain(0u8..8).collect::<std::vec::Vec<u8>>();
         let seed: [u8; 16] = seed_vec.as_slice().try_into().unwrap();
         rand::SeedableRng::from_seed(seed)
     }

library/core/src/prelude/v1.rs

@@ -59,12 +59,29 @@ pub use crate::hash::macros::Hash;
 
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(no_inline)]
+#[allow(deprecated)]
 pub use crate::{
-    assert, cfg, column, compile_error, concat, env, file, format_args,
-    format_args_nl, include, include_bytes, include_str, line, log_syntax, module_path, option_env,
-    stringify, trace_macros,
+    assert, assert_eq, assert_ne, cfg, column, compile_error, concat, debug_assert, debug_assert_eq, debug_assert_ne, file, format_args, include, include_bytes, include_str, line, matches, module_path, option_env, stringify, todo, r#try, unimplemented, unreachable, write, writeln,
 };
 
+// These macros needs special handling, so that we don't export it *and* the modules of the same
+// name. We only want the macro in the prelude.
+mod ambiguous_macro_only {
+    #[allow(hidden_glob_reexports)]
+    mod env {}
+    #[allow(hidden_glob_reexports)]
+    mod panic {}
+    #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+    pub use crate::*;
+}
+#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+#[doc(no_inline)]
+pub use self::ambiguous_macro_only::{env, panic};
+
+#[unstable(feature = "cfg_select", issue = "115585")]
+#[doc(no_inline)]
+pub use crate::cfg_select;
+
 #[unstable(
     feature = "concat_bytes",
     issue = "87555",
@@ -73,6 +90,30 @@ pub use crate::{
 #[doc(no_inline)]
 pub use crate::concat_bytes;
 
+#[unstable(feature = "const_format_args", issue = "none")]
+#[doc(no_inline)]
+pub use crate::const_format_args;
+
+#[unstable(
+    feature = "log_syntax",
+    issue = "29598",
+    reason = "`log_syntax!` is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use crate::log_syntax;
+
+#[unstable(feature = "pattern_type_macro", issue = "123646")]
+#[doc(no_inline)]
+pub use crate::pattern_type;
+
+#[unstable(
+    feature = "trace_macros",
+    issue = "29598",
+    reason = "`trace_macros` is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use crate::trace_macros;
+
 // Do not `doc(no_inline)` so that they become doc items on their own
 // (no public module for them to be re-exported from).
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]

library/proc_macro/src/bridge/symbol.rs

@@ -11,9 +11,12 @@
 
 use std::cell::RefCell;
 use std::num::NonZero;
-use std::str;
+use std::{fmt, str};
 
-use super::*;
+// Explicit import to avoid macro namespace collision.
+use super::{
+    DecodeMut, Encode, Mark, Marked, Reader, Unmark, Writer, arena, client, fxhash, server,
+};
 
 /// Handle for a symbol string stored within the Interner.
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]

library/std/src/prelude/mod.rs

@@ -145,6 +145,11 @@ pub mod rust_2021 {
     #[stable(feature = "prelude_2021", since = "1.55.0")]
     #[doc(no_inline)]
     pub use core::prelude::rust_2021::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[stable(feature = "prelude_2021", since = "1.55.0")]
+    pub use super::v1::panic;
 }
 
 /// The 2024 version of the prelude of The Rust Standard Library.
@@ -159,6 +164,11 @@ pub mod rust_2024 {
     #[stable(feature = "prelude_2024", since = "1.85.0")]
     #[doc(no_inline)]
     pub use core::prelude::rust_2024::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[stable(feature = "prelude_2024", since = "1.85.0")]
+    pub use super::v1::panic;
 }
 
 /// The Future version of the prelude of The Rust Standard Library.
@@ -174,4 +184,9 @@ pub mod rust_future {
     #[unstable(feature = "prelude_next", issue = "none")]
     #[doc(no_inline)]
     pub use core::prelude::rust_future::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[unstable(feature = "prelude_next", issue = "none")]
+    pub use super::v1::panic;
 }

library/std/src/prelude/v1.rs

@@ -43,15 +43,41 @@ pub use crate::option::Option::{self, None, Some};
 #[doc(no_inline)]
 pub use crate::result::Result::{self, Err, Ok};
 
-// Re-exported built-in macros
+// Re-exported built-in macros and traits
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(no_inline)]
+#[allow(deprecated)]
 pub use core::prelude::v1::{
-    assert, cfg, column, compile_error, concat, env, file, format_args,
-    format_args_nl, include, include_bytes, include_str, line, log_syntax, module_path, option_env,
-    stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd,
+    assert, assert_eq, assert_ne, cfg, column, compile_error, concat, debug_assert, debug_assert_eq, debug_assert_ne, env, file, format_args, include, include_bytes, include_str, line, matches,
+    module_path, option_env, stringify, todo, r#try, unimplemented, unreachable, write,
+    writeln, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd,
 };
 
+#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+#[doc(no_inline)]
+pub use crate::{
+    dbg, eprint, eprintln, format, is_x86_feature_detected, print, println, thread_local
+};
+
+// These macros needs special handling, so that we don't export it *and* the modules of the same
+// name. We only want the macro in the prelude.
+mod ambiguous_macro_only_std {
+    #[allow(hidden_glob_reexports)]
+    mod vec {}
+    #[allow(hidden_glob_reexports)]
+    mod panic {}
+    #[allow(exported_private_dependencies)]
+    #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+    pub use crate::*;
+}
+#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+#[doc(no_inline)]
+pub use self::ambiguous_macro_only_std::{vec, panic};
+
+#[unstable(feature = "cfg_select", issue = "115585")]
+#[doc(no_inline)]
+pub use core::prelude::v1::cfg_select;
+
 #[unstable(
     feature = "concat_bytes",
     issue = "87555",
@@ -60,6 +86,26 @@ pub use core::prelude::v1::{
 #[doc(no_inline)]
 pub use core::prelude::v1::concat_bytes;
 
+#[unstable(feature = "const_format_args", issue = "none")]
+#[doc(no_inline)]
+pub use core::prelude::v1::const_format_args;
+
+#[unstable(
+    feature = "log_syntax",
+    issue = "29598",
+    reason = "`log_syntax!` is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use core::prelude::v1::log_syntax;
+
+#[unstable(
+    feature = "trace_macros",
+    issue = "29598",
+    reason = "`trace_macros` is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use core::prelude::v1::trace_macros;
+
 // Do not `doc(no_inline)` so that they become doc items on their own
 // (no public module for them to be re-exported from).
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]

library/std/src/process.rs

@@ -169,7 +169,7 @@ use crate::path::Path;
 use crate::sys::pipe::{AnonPipe, read2};
 use crate::sys::process as imp;
 use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
-use crate::{fmt, fs, str};
+use crate::{fmt, format_args_nl, fs, str};
 
 /// Representation of a running or exited child process.
 ///

src/librustdoc/html/highlight.rs

@@ -7,6 +7,7 @@
 
 use std::collections::VecDeque;
 use std::fmt::{self, Display, Write};
+use std::format_args_nl;
 
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_lexer::{Cursor, FrontmatterAllowed, LiteralKind, TokenKind};

tests/pretty/asm.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/autodiff/autodiff_forward.pp

@@ -3,7 +3,8 @@
 //@ needs-enzyme
 
 #![feature(autodiff)]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/autodiff/autodiff_reverse.pp

@@ -3,7 +3,8 @@
 //@ needs-enzyme
 
 #![feature(autodiff)]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/autodiff/inherent_impl.pp

@@ -3,7 +3,8 @@
 //@ needs-enzyme
 
 #![feature(autodiff)]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/cast-lt.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/dollar-crate.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/expanded-and-path-remap-80832.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/format-args-str-escape.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;

tests/pretty/hir-delegation.pp

@@ -8,6 +8,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 
 fn b<C>(e: C) { }
 

tests/pretty/hir-fn-params.pp

@@ -2,6 +2,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-fn-params.pp

tests/pretty/hir-fn-variadic.pp

@@ -7,6 +7,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 
 extern "C" {
     unsafe fn foo(x: i32, va1: ...);

tests/pretty/hir-if-else.pp

@@ -2,6 +2,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-if-else.pp

tests/pretty/hir-lifetimes.pp

@@ -9,6 +9,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 
 struct Foo<'a> {
     x: &'a u32,

tests/pretty/hir-pretty-attr.pp

@@ -2,6 +2,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-pretty-attr.pp

tests/pretty/hir-pretty-loop.pp

@@ -2,6 +2,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-pretty-loop.pp

tests/pretty/hir-struct-expr.pp

@@ -2,6 +2,7 @@
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
+extern crate std;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-struct-expr.pp

tests/pretty/if-else.pp

@@ -1,6 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
-#[macro_use]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
 extern crate std;
 #[prelude_import]
 use ::std::prelude::rust_2015::*;