Skip to content

Commit c464184

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 rust-lang/rust#93166. Fixes rust-lang/git2-rs#706. Fixes rust-lang/rust#109064. Fixes rust-lang/wg-cargo-std-aware#74.
2 parents b8dab3e + 4a1a2b1 commit c464184

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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)