From 997feacddd8f6e98003428265c665f7149c49a48 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Wed, 6 Nov 2019 08:09:55 -0500
Subject: Snap cfgs

---
 src/libstd/lib.rs   | 1 -
 src/libstd/panic.rs | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/libstd')

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;
-- 
cgit 1.4.1-3-g733a5