diff options
| author | bors <bors@rust-lang.org> | 2019-11-13 00:42:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-13 00:42:19 +0000 |
| commit | 0f12bad718bb8b1fb2b1b7267a02fffaef6e1e3c (patch) | |
| tree | 74dbcc9dbde2f0d8bcbe1aead405c51193bf3b33 /src/libstd | |
| parent | a333eed7fc0c903df9d6befcfb40af02148bf255 (diff) | |
| parent | 994d83666defc0cc6b0fde305d164fbf23433114 (diff) | |
| download | rust-0f12bad718bb8b1fb2b1b7267a02fffaef6e1e3c.tar.gz rust-0f12bad718bb8b1fb2b1b7267a02fffaef6e1e3c.zip | |
Auto merge of #66156 - Mark-Simulacrum:stage0-step, r=pietroalbini
Stage0 step r? @pietroalbini
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 927fd2a6b0b..72d998de9c4 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -283,7 +283,6 @@ #![feature(needs_panic_runtime)] #![feature(never_type)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(non_exhaustive))] #![cfg_attr(bootstrap, feature(on_unimplemented))] #![feature(optin_builtin_traits)] #![feature(panic_info_message)] diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 577673b7e40..e36496d4c1c 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -13,7 +13,6 @@ use crate::panicking; use crate::ptr::{Unique, NonNull}; use crate::rc::Rc; use crate::sync::{Arc, Mutex, RwLock}; -#[cfg(not(bootstrap))] use crate::sync::atomic; use crate::task::{Context, Poll}; use crate::thread::Result; |