diff options
| author | bors <bors@rust-lang.org> | 2019-05-08 22:59:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-08 22:59:23 +0000 |
| commit | 9f8396158457943b63bb39534b9ef86868f7cfac (patch) | |
| tree | 0c1930967f41920013576e44024453b8b29893f9 /src/libstd | |
| parent | 3f5152e200c0c02dfe0f79367948c98053d35855 (diff) | |
| parent | f683b6b799e36987493ce23c2f96b5bf1a0bc528 (diff) | |
| download | rust-9f8396158457943b63bb39534b9ef86868f7cfac.tar.gz rust-9f8396158457943b63bb39534b9ef86868f7cfac.zip | |
Auto merge of #60651 - Centril:rollup-zoamjfk, r=Centril
Rollup of 8 pull requests Successful merges: - #59979 (to_xe_bytes for isize and usize returns an array of different size) - #60491 (std: Update compiler-builtins crate) - #60550 (Add tests for concrete const types) - #60572 (Add test for #59972) - #60627 (test for #50518) - #60634 (Document + Cleanup lang_items.rs) - #60641 (Instead of ICEing on incorrect pattern, use delay_span_bug) - #60644 (Use `delay_span_bug` for "Failed to unify obligation") Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index ac1aff845d8..ad5d62f667a 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -19,7 +19,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true } panic_abort = { path = "../libpanic_abort" } core = { path = "../libcore" } libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] } -compiler_builtins = { version = "0.1.9" } +compiler_builtins = { version = "0.1.12" } profiler_builtins = { path = "../libprofiler_builtins", optional = true } unwind = { path = "../libunwind" } hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] } |