Auto merge of #62687 - gnzlbg:stdarch, r=alexcrichton

Update stdsimd to stdarch The stdsimd repository no longer lives in `rust-lang-nursery/stdsimd` but now lives in `rust-lang/stdarch` instead. This PR updates the stdsimd submodule to the stdarch master branch.
rust-lang · Jul 15, 2019 · 4b65a86 · 4b65a86
2 parents 92b0f52 + d2c489a
commit 4b65a86
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -31,9 +31,9 @@
 [submodule "src/llvm-emscripten"]
 	path = src/llvm-emscripten
 	url = https://github.com/rust-lang/llvm.git
-[submodule "src/stdsimd"]
-	path = src/stdsimd
-	url = https://github.com/rust-lang-nursery/stdsimd.git
+[submodule "src/stdarch"]
+	path = src/stdarch
+	url = https://github.com/rust-lang/stdarch.git
 [submodule "src/doc/rustc-guide"]
 	path = src/doc/rustc-guide
 	url = https://github.com/rust-lang/rustc-guide.git

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -903,7 +903,7 @@ impl Step for Src {
             "src/libtest",
             "src/libterm",
             "src/libprofiler_builtins",
-            "src/stdsimd",
+            "src/stdarch",
             "src/libproc_macro",
             "src/tools/rustc-std-workspace-core",
             "src/tools/rustc-std-workspace-alloc",

diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
@@ -118,6 +118,8 @@
 #![feature(wasm_target_feature)]
 #![feature(avx512_target_feature)]
 #![feature(cmpxchg16b_target_feature)]
+#![feature(rtm_target_feature)]
+#![feature(f16c_target_feature)]
 #![feature(const_slice_len)]
 #![feature(const_str_as_bytes)]
 #![feature(const_str_len)]
@@ -228,12 +230,12 @@ mod tuple;
 mod unit;
 
 // Pull in the `core_arch` crate directly into libcore. The contents of
-// `core_arch` are in a different repository: rust-lang-nursery/stdsimd.
+// `core_arch` are in a different repository: rust-lang/stdarch.
 //
 // `core_arch` depends on libcore, but the contents of this module are
 // set up in such a way that directly pulling it here works such that the
 // crate uses the this crate as its libcore.
-#[path = "../stdsimd/crates/core_arch/src/mod.rs"]
+#[path = "../stdarch/crates/core_arch/src/mod.rs"]
 #[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
 #[unstable(feature = "stdsimd", issue = "48556")]
 mod core_arch;

diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
@@ -80,8 +80,8 @@ wasm_syscall = []
 # 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
+# Enable std_detect default features for stdarch/crates/std_detect:
+# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
 std_detect_file_io = []
 std_detect_dlsym_getauxval = []
 

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -492,12 +492,12 @@ mod memchr;
 pub mod rt;
 
 // Pull in the `std_detect` crate directly into libstd. The contents of
-// `std_detect` are in a different repository: rust-lang-nursery/stdsimd.
+// `std_detect` are in a different repository: rust-lang/stdarch.
 //
 // `std_detect` depends on libstd, but the contents of this module are
 // set up in such a way that directly pulling it here works such that the
 // crate uses the this crate as its libstd.
-#[path = "../stdsimd/crates/std_detect/src/mod.rs"]
+#[path = "../stdarch/crates/std_detect/src/mod.rs"]
 #[allow(missing_debug_implementations, missing_docs, dead_code)]
 #[unstable(feature = "stdsimd", issue = "48556")]
 #[cfg(not(test))]

diff --git a/src/stdarch b/src/stdarch
diff --git a/src/stdsimd b/src/stdsimd
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
@@ -59,7 +59,7 @@ fn filter_dirs(path: &Path) -> bool {
         "src/tools/lld",
         "src/tools/lldb",
         "src/target",
-        "src/stdsimd",
+        "src/stdarch",
         "src/rust-sgx",
         "target",
         "vendor",