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/core/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/core/src')
| -rw-r--r-- | library/core/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/core/src/macros/mod.rs | 22 | ||||
| -rw-r--r-- | library/core/src/mem/mod.rs | 8 |
3 files changed, 0 insertions, 31 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 7c0e5ab8926..0d1a09a528d 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -128,7 +128,6 @@ #![feature(repr_simd, platform_intrinsics)] #![feature(rustc_attrs)] #![feature(simd_ffi)] -#![cfg_attr(bootstrap, feature(min_const_generics))] #![feature(min_specialization)] #![feature(staged_api)] #![feature(std_internals)] diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index 0a7e7bfc32f..41ea2760ec5 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -1,25 +1,3 @@ -#[cfg(bootstrap)] -#[doc(include = "panic.md")] -#[macro_export] -#[allow_internal_unstable(core_panic)] -#[stable(feature = "core", since = "1.6.0")] -#[rustc_diagnostic_item = "core_panic_macro"] -macro_rules! panic { - () => ( - $crate::panic!("explicit panic") - ); - ($msg:literal $(,)?) => ( - $crate::panicking::panic($msg) - ); - ($msg:expr $(,)?) => ( - $crate::panicking::panic_str($msg) - ); - ($fmt:expr, $($arg:tt)+) => ( - $crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) - ); -} - -#[cfg(not(bootstrap))] #[doc(include = "panic.md")] #[macro_export] #[rustc_builtin_macro = "core_panic"] diff --git a/library/core/src/mem/mod.rs b/library/core/src/mem/mod.rs index 778e34e634f..87890f92759 100644 --- a/library/core/src/mem/mod.rs +++ b/library/core/src/mem/mod.rs @@ -4,7 +4,6 @@ //! types, initializing and manipulating memory. #![stable(feature = "rust1", since = "1.0.0")] -#![cfg_attr(bootstrap, allow(unused_unsafe))] use crate::clone; use crate::cmp; @@ -152,13 +151,6 @@ pub const fn forget<T>(t: T) { #[inline] #[unstable(feature = "forget_unsized", issue = "none")] pub fn forget_unsized<T: ?Sized>(t: T) { - #[cfg(bootstrap)] - // SAFETY: the forget intrinsic could be safe, but there's no point in making it safe since - // we'll be implementing this function soon via `ManuallyDrop` - unsafe { - intrinsics::forget(t) - } - #[cfg(not(bootstrap))] intrinsics::forget(t) } |