Skip to content

Commit

Permalink
Auto merge of rust-lang#113269 - jyn514:update-compiler-builtins, r=A…
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Jul 6, 2023
2 parents 87c8c83 + fd7f531 commit 85bf079
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -637,9 +637,9 @@ dependencies = [

[[package]]
name = "compiler_builtins"
version = "0.1.93"
version = "0.1.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781"
checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
dependencies = [
"cc",
"rustc-std-workspace-core",
Expand Down
3 changes: 1 addition & 2 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core", public = true }
libc = { version = "0.2.146", default-features = false, features = ['rustc-dep-of-std'], public = true }
# FIXME(Nilstrieb): https://github.com/rust-lang/compiler-builtins/pull/532/files#r1249354225
compiler_builtins = { version = "=0.1.93" }
compiler_builtins = { version = "0.1.95" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
Expand Down

0 comments on commit 85bf079

Please sign in to comment.