Skip to content

Commit d215d95

Browse files
committed
Auto merge of #58373 - RalfJung:maybe-uninit, r=gnzlbg
update stdsimd and remove now-unused MaybeUninit::into_inner That's a huge diff for stdsimd... Cc @gnzlbg @alexcrichton
2 parents 9a3392e + aba0d29 commit d215d95

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

src/libcore/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
#![feature(adx_target_feature)]
125125
#![feature(maybe_uninit, maybe_uninit_slice, maybe_uninit_array)]
126126
#![feature(unrestricted_attribute_tokens)]
127+
#![feature(external_doc)]
127128

128129
#[prelude_import]
129130
#[allow(unused)]

src/libcore/mem.rs

-8
Original file line numberDiff line numberDiff line change
@@ -1185,14 +1185,6 @@ impl<T> MaybeUninit<T> {
11851185
ManuallyDrop::into_inner(self.value)
11861186
}
11871187

1188-
/// Deprecated alternative to `into_initialized`. Will never get stabilized.
1189-
/// Exists only to transition stdsimd to `into_initialized`.
1190-
#[inline(always)]
1191-
#[allow(unused)]
1192-
pub(crate) unsafe fn into_inner(self) -> T {
1193-
self.into_initialized()
1194-
}
1195-
11961188
/// Gets a reference to the contained value.
11971189
///
11981190
/// # Unsafety

src/libstd/Cargo.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] }
4747
cc = "1.0"
4848

4949
[features]
50-
default = ["compiler_builtins_c"]
50+
default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getauxval"]
5151

5252
backtrace = ["backtrace-sys"]
5353
panic-unwind = ["panic_unwind"]
@@ -66,3 +66,8 @@ wasm_syscall = []
6666
# the environment for hooking up some thread-related information like the
6767
# current thread id and accessing/getting the current thread's TCB
6868
wasm-bindgen-threads = []
69+
70+
# Enable std_detect default features for stdsimd:
71+
# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml
72+
std_detect_file_io = []
73+
std_detect_dlsym_getauxval = []

src/stdsimd

0 commit comments

Comments
 (0)