diff options
| author | bors <bors@rust-lang.org> | 2023-07-06 18:58:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-06 18:58:54 +0000 |
| commit | 85bf07972a1041b9e25393b803d0e006bec3eaaf (patch) | |
| tree | 26f16a6fd3e208dce49bddb592ddfe24871cabfb /library/std | |
| parent | 87c8c83ec73eb0dd42e255f82813afa3dde24a57 (diff) | |
| parent | fd7f53112ab688ac6e6aa9d1b049fac45945552a (diff) | |
| download | rust-85bf07972a1041b9e25393b803d0e006bec3eaaf.tar.gz rust-85bf07972a1041b9e25393b803d0e006bec3eaaf.zip | |
Auto merge of #113269 - jyn514:update-compiler-builtins, r=Amanieu
Update compiler builtins cc https://github.com/rust-lang/compiler-builtins/pull/532#discussion_r1249354225 in particular this pulls in https://github.com/rust-lang/compiler-builtins/pull/532 and https://github.com/rust-lang/compiler-builtins/pull/535. Fixes https://github.com/rust-lang/rust/issues/93166. Fixes https://github.com/rust-lang/git2-rs/issues/706. Fixes https://github.com/rust-lang/rust/issues/109064. Fixes https://github.com/rust-lang/wg-cargo-std-aware/issues/74.
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/Cargo.toml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 77b657fd868..eb4815d0cdf 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -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'] } |