From 9f197198b8f7692e9f7d4e65bf8b7494d8eed024 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 11 Feb 2019 15:24:38 +0100 Subject: [PATCH 1/6] update stdsimd --- src/stdsimd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdsimd b/src/stdsimd index b23541340b594..c546604f74eba 160000 --- a/src/stdsimd +++ b/src/stdsimd @@ -1 +1 @@ -Subproject commit b23541340b5941749e5fbb1930e666bbd1375244 +Subproject commit c546604f74eba6a7b423d98d3ab0abe9a2e56897 From 1546e07e63b7d0cf35688dc0215b4fb898d539db Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 11 Feb 2019 15:29:25 +0100 Subject: [PATCH 2/6] add missing feature flag --- src/libcore/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 419980225c335..af6161bafe0d4 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -124,6 +124,7 @@ #![feature(adx_target_feature)] #![feature(maybe_uninit)] #![feature(unrestricted_attribute_tokens)] +#![feature(external_doc)] #[prelude_import] #[allow(unused)] From a707a85530adf095c2d0bd91f57c7c152cc613b1 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 11 Feb 2019 22:00:10 +0100 Subject: [PATCH 3/6] fixed for libstd build --- src/libcore/core_arch_docs.md | 1 + src/libstd/Cargo.toml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 120000 src/libcore/core_arch_docs.md diff --git a/src/libcore/core_arch_docs.md b/src/libcore/core_arch_docs.md new file mode 120000 index 0000000000000..b80b2af061ea0 --- /dev/null +++ b/src/libcore/core_arch_docs.md @@ -0,0 +1 @@ +../stdsimd/crates/core_arch/src/core_arch_docs.md \ No newline at end of file diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 92876f7f2d804..24745c1137058 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,7 @@ 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 = [] + +# stdsimd features +std_detect_file_io = [] +std_detect_dlsym_getauxval = [] From 1e4ab1eca643762be78724767b1f0b86950afde2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 12 Feb 2019 09:01:49 +0100 Subject: [PATCH 4/6] update stdsimd --- src/libcore/core_arch_docs.md | 1 - src/libstd/Cargo.toml | 3 ++- src/stdsimd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 120000 src/libcore/core_arch_docs.md diff --git a/src/libcore/core_arch_docs.md b/src/libcore/core_arch_docs.md deleted file mode 120000 index b80b2af061ea0..0000000000000 --- a/src/libcore/core_arch_docs.md +++ /dev/null @@ -1 +0,0 @@ -../stdsimd/crates/core_arch/src/core_arch_docs.md \ No newline at end of file diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 24745c1137058..7d60a170422b3 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -67,6 +67,7 @@ wasm_syscall = [] # current thread id and accessing/getting the current thread's TCB wasm-bindgen-threads = [] -# stdsimd features +# 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 c546604f74eba..00f88e7f2d7ec 160000 --- a/src/stdsimd +++ b/src/stdsimd @@ -1 +1 @@ -Subproject commit c546604f74eba6a7b423d98d3ab0abe9a2e56897 +Subproject commit 00f88e7f2d7ec8ee9090514a03f3def3c106227c From c35a18ec2de105eeb121e86817ccb91984ff5bc3 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 14 Feb 2019 16:21:21 +0100 Subject: [PATCH 5/6] remove MaybeUninit::into_inner --- src/libcore/mem.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 2a493e88fe896..ce856628318b8 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -1149,14 +1149,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 From aba0d29320a49cc8c62b02168da4dabd1c332a03 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 17 Feb 2019 11:22:04 +0100 Subject: [PATCH 6/6] update stdsimd --- src/stdsimd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdsimd b/src/stdsimd index 00f88e7f2d7ec..9a60697044088 160000 --- a/src/stdsimd +++ b/src/stdsimd @@ -1 +1 @@ -Subproject commit 00f88e7f2d7ec8ee9090514a03f3def3c106227c +Subproject commit 9a60697044088f6704a40da78dee25eb6d55fd6f