Skip to content

Commit 92d8bf9

Browse files
authored
Rollup merge of #101861 - wesleywiser:update_stdarch, r=Amanieu
Update stdarch This pulls in the following changes: - [Use simd_bitmask intrinsic in a couple of places](rust-lang/stdarch@9f09287) - [Remove simd_shuffle<n> usage in favor of simd_shuffle](rust-lang/stdarch@3fd17e4) - [Remove late specifiers in __cpuid_count](rust-lang/stdarch@f1db941) - Helps with #101346 - [Use mov and xchg instead of movl(q) and xchgl(q)](rust-lang/stdarch@3049a31) - [Bump cfg-if dependency to 1.0](rust-lang/stdarch@f305cc8) - [Fix documentation of __m256bh and __m512bh structs](rust-lang/stdarch@699c093) r? ``@Amanieu``
2 parents 030f453 + 9286c3c commit 92d8bf9

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Cargo.lock

+6-2
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,10 @@ name = "cfg-if"
507507
version = "1.0.0"
508508
source = "registry+https://github.com/rust-lang/crates.io-index"
509509
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
510+
dependencies = [
511+
"compiler_builtins",
512+
"rustc-std-workspace-core",
513+
]
510514

511515
[[package]]
512516
name = "chalk-derive"
@@ -4613,7 +4617,7 @@ version = "0.0.0"
46134617
dependencies = [
46144618
"addr2line 0.16.0",
46154619
"alloc",
4616-
"cfg-if 0.1.10",
4620+
"cfg-if 1.0.0",
46174621
"compiler_builtins",
46184622
"core",
46194623
"dlmalloc",
@@ -4637,7 +4641,7 @@ dependencies = [
46374641
name = "std_detect"
46384642
version = "0.1.5"
46394643
dependencies = [
4640-
"cfg-if 0.1.10",
4644+
"cfg-if 1.0.0",
46414645
"compiler_builtins",
46424646
"libc",
46434647
"rustc-std-workspace-alloc",

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["dylib", "rlib"]
1111

1212
[dependencies]
1313
alloc = { path = "../alloc" }
14-
cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
14+
cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1515
panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }

0 commit comments

Comments
 (0)