Skip to content

Commit

Permalink
Rollup merge of #101861 - wesleywiser:update_stdarch, r=Amanieu
Browse files Browse the repository at this point in the history
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``
  • Loading branch information
matthiaskrgr authored Sep 17, 2022
2 parents 030f453 + 9286c3c commit 92d8bf9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,10 @@ name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-core",
]

[[package]]
name = "chalk-derive"
Expand Down Expand Up @@ -4613,7 +4617,7 @@ version = "0.0.0"
dependencies = [
"addr2line 0.16.0",
"alloc",
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"compiler_builtins",
"core",
"dlmalloc",
Expand All @@ -4637,7 +4641,7 @@ dependencies = [
name = "std_detect"
version = "0.1.5"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"compiler_builtins",
"libc",
"rustc-std-workspace-alloc",
Expand Down
2 changes: 1 addition & 1 deletion library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["dylib", "rlib"]

[dependencies]
alloc = { path = "../alloc" }
cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core" }
Expand Down

0 comments on commit 92d8bf9

Please sign in to comment.