about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-07-15 16:00:48 +0000
committerbors <bors@rust-lang.org>2019-07-15 16:00:48 +0000
commit4b65a86ebace8600c8e269e8bfe3365cdc460e68 (patch)
tree0117491fffc657dfc3e7736fa0a903a52b049ca8 /src/libstd
parent92b0f52584c9375505ecdefdd7855b93a5919d51 (diff)
parentd2c489a2722a6c0b2cbe9fc88d01bf896f3a07a5 (diff)
downloadrust-4b65a86ebace8600c8e269e8bfe3365cdc460e68.tar.gz
rust-4b65a86ebace8600c8e269e8bfe3365cdc460e68.zip
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.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/Cargo.toml4
-rw-r--r--src/libstd/lib.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 38df1f26d95..6da77ab57d1 100644
--- 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
index fb9a228880e..f394195d77a 100644
--- 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))]