diff options
| author | bors <bors@rust-lang.org> | 2021-02-23 07:19:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-23 07:19:41 +0000 |
| commit | cd64446196a02e593c5f50b8d863161306da43f7 (patch) | |
| tree | 6de1147cc53c807e789794cb944ab9b3cdb4c1e8 /library/std/src | |
| parent | a4e595db8f12f9ee926256745d757004b850703f (diff) | |
| parent | b1a4bca3e6a03eb59d4ef748a32448226015a2f5 (diff) | |
| download | rust-cd64446196a02e593c5f50b8d863161306da43f7.tar.gz rust-cd64446196a02e593c5f50b8d863161306da43f7.zip | |
Auto merge of #82076 - jyn514:update-bootstrap, r=Mark-Simulacrum
Update the bootstrap compiler This updates the bootstrap compiler, notably leaving out a change to enable semicolon in macro expressions lint, because stdarch still depends on the old behavior.
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 4 | ||||
| -rw-r--r-- | library/std/src/macros.rs | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 5e46d2c17c9..588bffb57c9 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -185,8 +185,8 @@ //! [other]: #what-is-in-the-standard-library-documentation //! [primitive types]: ../book/ch03-02-data-types.html //! [rust-discord]: https://discord.gg/rust-lang -#![cfg_attr(not(bootstrap), doc = "[array]: prim@array")] -#![cfg_attr(not(bootstrap), doc = "[slice]: prim@slice")] +//! [array]: prim@array +//! [slice]: prim@slice #![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))] #![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))] #![doc( diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs index 0ce6542cb72..c0750f8c0d1 100644 --- a/library/std/src/macros.rs +++ b/library/std/src/macros.rs @@ -4,21 +4,6 @@ //! library. Each macro is available for use when linking against the standard //! library. -#[cfg(bootstrap)] -#[doc(include = "../../core/src/macros/panic.md")] -#[macro_export] -#[stable(feature = "rust1", since = "1.0.0")] -#[allow_internal_unstable(libstd_sys_internals)] -#[cfg_attr(not(test), rustc_diagnostic_item = "std_panic_macro")] -macro_rules! panic { - () => ({ $crate::panic!("explicit panic") }); - ($msg:expr $(,)?) => ({ $crate::rt::begin_panic($msg) }); - ($fmt:expr, $($arg:tt)+) => ({ - $crate::rt::begin_panic_fmt(&$crate::format_args!($fmt, $($arg)+)) - }); -} - -#[cfg(not(bootstrap))] #[doc(include = "../../core/src/macros/panic.md")] #[macro_export] #[rustc_builtin_macro = "std_panic"] |