diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index d046236b5353a..f2165c676fd44 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -124,6 +124,7 @@ #![feature(adx_target_feature)] #![feature(maybe_uninit, maybe_uninit_slice, maybe_uninit_array)] #![feature(unrestricted_attribute_tokens)] +#![feature(external_doc)] #[prelude_import] #[allow(unused)] diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index e0b0e72ff9b5f..43afc9a522a30 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -1185,14 +1185,6 @@ impl MaybeUninit { ManuallyDrop::into_inner(self.value) } - /// Deprecated alternative to `into_initialized`. Will never get stabilized. - /// Exists only to transition stdsimd to `into_initialized`. - #[inline(always)] - #[allow(unused)] - pub(crate) unsafe fn into_inner(self) -> T { - self.into_initialized() - } - /// Gets a reference to the contained value. /// /// # Unsafety diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 92876f7f2d804..7d60a170422b3 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -47,7 +47,7 @@ fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] } cc = "1.0" [features] -default = ["compiler_builtins_c"] +default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getauxval"] backtrace = ["backtrace-sys"] panic-unwind = ["panic_unwind"] @@ -66,3 +66,8 @@ wasm_syscall = [] # the environment for hooking up some thread-related information like the # current thread id and accessing/getting the current thread's TCB wasm-bindgen-threads = [] + +# Enable std_detect default features for stdsimd: +# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml +std_detect_file_io = [] +std_detect_dlsym_getauxval = [] diff --git a/src/stdsimd b/src/stdsimd index b23541340b594..9a60697044088 160000 --- a/src/stdsimd +++ b/src/stdsimd @@ -1 +1 @@ -Subproject commit b23541340b5941749e5fbb1930e666bbd1375244 +Subproject commit 9a60697044088f6704a40da78dee25eb6d55fd6f