diff options
| author | bors <bors@rust-lang.org> | 2019-05-17 16:11:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-17 16:11:20 +0000 |
| commit | 823a75d9ba34860b9a6712c7a9d35e86e0a88436 (patch) | |
| tree | 245f454ef9bd811ce7bfc3b27fde1b417d486cc6 /src/libstd | |
| parent | b982867a7349f84c17317599b59aeb5a7d8a83be (diff) | |
| parent | 3c9790e4293e41a1a45a50eaee4e76a1fb64d5f8 (diff) | |
| download | rust-823a75d9ba34860b9a6712c7a9d35e86e0a88436.tar.gz rust-823a75d9ba34860b9a6712c7a9d35e86e0a88436.zip | |
Auto merge of #60841 - alexcrichton:update-compiler-builtins, r=RalfJung
Update the compiler_builtins crate This updates to 0.1.13 for `compiler_builtins`, published to fix a few issues. The feature changes here are updated because `compiler_builtins` no longer enables the `c` feature by default but we want to do so through our build still. Closes #60747 Closes #60782
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 5d797b75621..55e8b39974e 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.12" } +compiler_builtins = { version = "0.1.14" } profiler_builtins = { path = "../libprofiler_builtins", optional = true } unwind = { path = "../libunwind" } hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] } @@ -54,7 +54,7 @@ default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getaux backtrace = ["backtrace-sys"] panic-unwind = ["panic_unwind"] profiler = ["profiler_builtins"] -compiler_builtins_c = ["compiler_builtins/c"] +compiler_builtins_c = ["alloc/compiler-builtins-c"] llvm-libunwind = ["unwind/llvm-libunwind"] # Make panics and failed asserts immediately abort without formatting any message |