Skip to content

Commit

Permalink
Auto merge of #93696 - Amanieu:compiler-builtins-0.1.68, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

Bump compiler-builtins to 0.1.69

This includes rust-lang/compiler-builtins#452 which should fix some issues with duplicate symbol defintions of some intrinsics.
  • Loading branch information
bors committed Feb 13, 2022
2 parents 5c30d65 + 7b8f6ac commit 01c4c41
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -761,9 +761,9 @@ dependencies = [

[[package]]
name = "compiler_builtins"
version = "0.1.67"
version = "0.1.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a68c69e9451f1df4b215c9588c621670c12286b53e60fb5ec4b59aaa1138d18e"
checksum = "ac0d1d6b2307c15fd27af2bb41234b4ebddeae69f33714bfbdb44b3b5a6e3efe"
dependencies = [
"cc",
"rustc-std-workspace-core",
Expand Down
2 changes: 1 addition & 1 deletion library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core" }
libc = { version = "0.2.116", default-features = false, features = ['rustc-dep-of-std'] }
compiler_builtins = { version = "0.1.67" }
compiler_builtins = { version = "0.1.69" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }
Expand Down

0 comments on commit 01c4c41

Please sign in to comment.