Skip to content

Commit

Permalink
Rollup merge of rust-lang#129400 - Amjad50:update-compiler-builtins, …
Browse files Browse the repository at this point in the history
…r=tgross35

Update `compiler_builtins` to `0.1.120`

Includes rust-lang/compiler-builtins#672 which fixes regression issue with Apple and Windows compilers.

try-job: aarch64-apple
try-job: x86_64-apple-1
try-job: x86_64-msvc
  • Loading branch information
matthiaskrgr authored Aug 23, 2024
2 parents 2c06146 + 12944c7 commit e2614f2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion alloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"

[dependencies]
core = { path = "../core" }
compiler_builtins = { version = "0.1.118", features = ['rustc-dep-of-std'] }
compiler_builtins = { version = "0.1.120", features = ['rustc-dep-of-std'] }

[dev-dependencies]
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
Expand Down
2 changes: 1 addition & 1 deletion std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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", public = true }
compiler_builtins = { version = "0.1.118" }
compiler_builtins = { version = "0.1.120" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.14", default-features = false, features = [
Expand Down

0 comments on commit e2614f2

Please sign in to comment.