Auto merge of #80790 - JohnTitor:rollup-js1noez, r=JohnTitor

[rust.git] / library / std / src / lib.rs

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 4126c8b714f7a50f9f7e8f47e999cec394d99980..15ef5d1619ba33cd8f458a028795e7ceef85368e 100644 (file)
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -289,8 +289,7 @@
 #![feature(nll)]
 #![feature(nonnull_slice_from_raw_parts)]
 #![feature(once_cell)]
-#![cfg_attr(bootstrap, feature(optin_builtin_traits))]
-#![cfg_attr(not(bootstrap), feature(auto_traits))]
+#![feature(auto_traits)]
 #![feature(or_patterns)]
 #![feature(panic_info_message)]
 #![feature(panic_internals)]
@@ -308,7 +307,6 @@
 #![feature(slice_internals)]
 #![feature(slice_ptr_get)]
 #![feature(slice_ptr_len)]
-#![feature(slice_strip)]
 #![feature(staged_api)]
 #![feature(std_internals)]
 #![feature(stdsimd)]