Skip to content

Commit 4b65a86

Browse files
committed
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.
2 parents 92b0f52 + d2c489a commit 4b65a86

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
[submodule "src/llvm-emscripten"]
3232
path = src/llvm-emscripten
3333
url = https://github.com/rust-lang/llvm.git
34-
[submodule "src/stdsimd"]
35-
path = src/stdsimd
36-
url = https://github.com/rust-lang-nursery/stdsimd.git
34+
[submodule "src/stdarch"]
35+
path = src/stdarch
36+
url = https://github.com/rust-lang/stdarch.git
3737
[submodule "src/doc/rustc-guide"]
3838
path = src/doc/rustc-guide
3939
url = https://github.com/rust-lang/rustc-guide.git

src/bootstrap/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ impl Step for Src {
903903
"src/libtest",
904904
"src/libterm",
905905
"src/libprofiler_builtins",
906-
"src/stdsimd",
906+
"src/stdarch",
907907
"src/libproc_macro",
908908
"src/tools/rustc-std-workspace-core",
909909
"src/tools/rustc-std-workspace-alloc",

src/libcore/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118
#![feature(wasm_target_feature)]
119119
#![feature(avx512_target_feature)]
120120
#![feature(cmpxchg16b_target_feature)]
121+
#![feature(rtm_target_feature)]
122+
#![feature(f16c_target_feature)]
121123
#![feature(const_slice_len)]
122124
#![feature(const_str_as_bytes)]
123125
#![feature(const_str_len)]
@@ -228,12 +230,12 @@ mod tuple;
228230
mod unit;
229231

230232
// Pull in the `core_arch` crate directly into libcore. The contents of
231-
// `core_arch` are in a different repository: rust-lang-nursery/stdsimd.
233+
// `core_arch` are in a different repository: rust-lang/stdarch.
232234
//
233235
// `core_arch` depends on libcore, but the contents of this module are
234236
// set up in such a way that directly pulling it here works such that the
235237
// crate uses the this crate as its libcore.
236-
#[path = "../stdsimd/crates/core_arch/src/mod.rs"]
238+
#[path = "../stdarch/crates/core_arch/src/mod.rs"]
237239
#[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
238240
#[unstable(feature = "stdsimd", issue = "48556")]
239241
mod core_arch;

src/libstd/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ wasm_syscall = []
8080
# current thread id and accessing/getting the current thread's TCB
8181
wasm-bindgen-threads = []
8282

83-
# Enable std_detect default features for stdsimd:
84-
# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml
83+
# Enable std_detect default features for stdarch/crates/std_detect:
84+
# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
8585
std_detect_file_io = []
8686
std_detect_dlsym_getauxval = []
8787

src/libstd/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,12 @@ mod memchr;
492492
pub mod rt;
493493

494494
// Pull in the `std_detect` crate directly into libstd. The contents of
495-
// `std_detect` are in a different repository: rust-lang-nursery/stdsimd.
495+
// `std_detect` are in a different repository: rust-lang/stdarch.
496496
//
497497
// `std_detect` depends on libstd, but the contents of this module are
498498
// set up in such a way that directly pulling it here works such that the
499499
// crate uses the this crate as its libstd.
500-
#[path = "../stdsimd/crates/std_detect/src/mod.rs"]
500+
#[path = "../stdarch/crates/std_detect/src/mod.rs"]
501501
#[allow(missing_debug_implementations, missing_docs, dead_code)]
502502
#[unstable(feature = "stdsimd", issue = "48556")]
503503
#[cfg(not(test))]

src/stdarch

Submodule stdarch added at b881a2d

src/stdsimd

-1
This file was deleted.

src/tools/tidy/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn filter_dirs(path: &Path) -> bool {
5959
"src/tools/lld",
6060
"src/tools/lldb",
6161
"src/target",
62-
"src/stdsimd",
62+
"src/stdarch",
6363
"src/rust-sgx",
6464
"target",
6565
"vendor",

0 commit comments

Comments
 (0)