Skip to content

Commit 85bf079

Browse files
committed
Auto merge of #113269 - jyn514:update-compiler-builtins, r=Amanieu
Update compiler builtins cc rust-lang/compiler-builtins#532 (comment) in particular this pulls in rust-lang/compiler-builtins#532 and rust-lang/compiler-builtins#535. Fixes #93166. Fixes rust-lang/git2-rs#706. Fixes #109064. Fixes rust-lang/wg-cargo-std-aware#74.
2 parents 87c8c83 + fd7f531 commit 85bf079

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@ dependencies = [
637637

638638
[[package]]
639639
name = "compiler_builtins"
640-
version = "0.1.93"
640+
version = "0.1.95"
641641
source = "registry+https://github.com/rust-lang/crates.io-index"
642-
checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781"
642+
checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
643643
dependencies = [
644644
"cc",
645645
"rustc-std-workspace-core",

Diff for: library/std/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
1818
panic_abort = { path = "../panic_abort" }
1919
core = { path = "../core", public = true }
2020
libc = { version = "0.2.146", default-features = false, features = ['rustc-dep-of-std'], public = true }
21-
# FIXME(Nilstrieb): https://github.com/rust-lang/compiler-builtins/pull/532/files#r1249354225
22-
compiler_builtins = { version = "=0.1.93" }
21+
compiler_builtins = { version = "0.1.95" }
2322
profiler_builtins = { path = "../profiler_builtins", optional = true }
2423
unwind = { path = "../unwind" }
2524
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }

0 commit comments

Comments
 (0)