diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-22 15:45:35 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-25 09:25:33 -0400 |
| commit | 93eed402adbe9e7a532995500d50716d52eefee9 (patch) | |
| tree | ef6d0177fa8dac0ed4edff1de6ee9cf6a3e6b016 /src/libcore/macros | |
| parent | 0b958790b336738540d027d645718713849638d7 (diff) | |
| download | rust-93eed402adbe9e7a532995500d50716d52eefee9.tar.gz rust-93eed402adbe9e7a532995500d50716d52eefee9.zip | |
Bump bootstrap compiler
Diffstat (limited to 'src/libcore/macros')
| -rw-r--r-- | src/libcore/macros/mod.rs | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/src/libcore/macros/mod.rs b/src/libcore/macros/mod.rs index 73404a73e3d..f86eee788c0 100644 --- a/src/libcore/macros/mod.rs +++ b/src/libcore/macros/mod.rs @@ -1,27 +1,3 @@ -#[cfg(bootstrap)] -#[doc(include = "panic.md")] -#[macro_export] -#[allow_internal_unstable(core_panic, track_caller)] -#[stable(feature = "core", since = "1.6.0")] -macro_rules! panic { - () => ( - $crate::panic!("explicit panic") - ); - ($msg:expr) => ( - $crate::panicking::panic($msg) - ); - ($msg:expr,) => ( - $crate::panic!($msg) - ); - ($fmt:expr, $($arg:tt)+) => ( - $crate::panicking::panic_fmt( - $crate::format_args!($fmt, $($arg)+), - $crate::panic::Location::caller(), - ) - ); -} - -#[cfg(not(bootstrap))] #[doc(include = "panic.md")] #[macro_export] #[allow_internal_unstable(core_panic, track_caller)] @@ -360,7 +336,7 @@ macro_rules! r#try { } }; ($expr:expr,) => { - $crate::r#try!($expr) + $crate::try!($expr) }; } @@ -1341,25 +1317,6 @@ pub(crate) mod builtin { /// Read the [unstable book] for the usage. /// /// [unstable book]: ../unstable-book/library-features/asm.html - #[cfg(bootstrap)] - #[unstable( - feature = "llvm_asm", - issue = "70173", - reason = "inline assembly is not stable enough for use and is subject to change" - )] - #[macro_export] - #[allow_internal_unstable(asm)] - macro_rules! llvm_asm { - // Redirect to asm! for stage0 - ($($arg:tt)*) => { $crate::asm!($($arg)*) } - } - - /// Inline assembly. - /// - /// Read the [unstable book] for the usage. - /// - /// [unstable book]: ../unstable-book/library-features/asm.html - #[cfg(not(bootstrap))] #[unstable( feature = "llvm_asm", issue = "70173", @@ -1460,7 +1417,6 @@ pub(crate) mod builtin { } /// Keeps the item it's applied to if the passed path is accessible, and removes it otherwise. - #[cfg(not(bootstrap))] #[unstable( feature = "cfg_accessible", issue = "64797", |