Update the stdarch submodule

diff --git a/.gitmodules b/.gitmodules
index dd74d49828f757f514482b237e4b98bc3853264a..9dd9f33cd0eb997a415736c6469e47e11543c383 100644 (file)
--- 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
index 3e9596f446b380e48ec167e74130b37444a05325..bd012a887c26ee70fbfb53577c765850397cf217 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -903,7 +903,7 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
             "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
index 04253858bf7042d6c0896a01a6d3d524c049861c..cfac8eb78bd95cfc57681c23157c23982681be68 100644 (file)
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -228,12 +228,12 @@
 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
index 38df1f26d95fd9aa5b64a7e8b12cb3241fce69bc..6da77ab57d11e8a741594cbad8215eef0db76251 100644 (file)
--- 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 fb9a228880eb7304d9484bce138313d6a9ec9c2d..f394195d77aca58b9a87f5c77d1611b58cc2fb1f 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -492,12 +492,12 @@ pub mod task {
 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
new file mode 160000 (submodule)
index 0000000..8cb42c9
--- /dev/null
+++ b/src/stdarch
@@ -0,0 +1 @@
+Subproject commit 8cb42c97023fc1cd69f8f81e351b8ba18dcf233b

diff --git a/src/stdsimd b/src/stdsimd
deleted file mode 160000 (submodule)
index 4bf456c..0000000
--- a/src/stdsimd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4bf456c35e85fcca5cf95008401af8ab25abf850

diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index a0bf0b073541807caecd000775fe90733d079d67..06c1a8c18bac7b7e323a24754ff154879504a66b 100644 (file)
--- 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",