diff options
| author | bors <bors@rust-lang.org> | 2019-06-05 08:20:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-05 08:20:20 +0000 |
| commit | 817d2feb13dd1faad47ec699cd473b8be2093ec9 (patch) | |
| tree | cc952593ab8e17ebbe991eb159450d8149f560ff | |
| parent | 81eb15210a0c43820b146cd9ae6fd2062e1b2922 (diff) | |
| parent | fa1b6add097bf8865e843169b5ae0656b0486dad (diff) | |
| download | rust-817d2feb13dd1faad47ec699cd473b8be2093ec9.tar.gz rust-817d2feb13dd1faad47ec699cd473b8be2093ec9.zip | |
Auto merge of #61502 - alexcrichton:update-backtrace, r=estebank
std: Update dependency on `backtrace` Discovered in #61416 an accidental regression in libstd's backtrace behavior is that it previously attempted to consult libbacktrace and would then fall back to `dladdr` if libbacktrace didn't report anything. The `backtrace` crate, however, did not do this, so that's now been fixed! Changes: https://github.com/rust-lang/backtrace-rs/compare/0.3.25...0.3.29 Closes #61416
| -rw-r--r-- | Cargo.lock | 14 | ||||
| -rw-r--r-- | src/libstd/Cargo.toml | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5293391a071..7892bc70695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.25" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -837,7 +837,7 @@ name = "error-chain" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -845,7 +845,7 @@ name = "error-chain" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -860,7 +860,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2375,7 +2375,7 @@ name = "rustc" version = "0.0.0" dependencies = [ "arena 0.0.0", - "backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3336,7 +3336,7 @@ name = "std" version = "0.0.0" dependencies = [ "alloc 0.0.0", - "backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "core 0.0.0", @@ -4120,7 +4120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" -"checksum backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)" = "1c50b4cb6d852a8567d98bb11c03f91ccec4dfbd88778bc1b92789c624081283" +"checksum backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "2d631cd7af21b7ff796293f1990104e3cdb606852863bac32f000c193aa35dfb" "checksum backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea90dd7b012b3d1a2cb6bec16670a0db2c95d4e931e84f4047e0460c1b34c8d" "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" "checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf" diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index cf1dbba0055..816a191a2a9 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -25,7 +25,7 @@ unwind = { path = "../libunwind" } hashbrown = { version = "0.4.0", features = ['rustc-dep-of-std'] } [dependencies.backtrace] -version = "0.3.25" +version = "0.3.29" default-features = false # don't use coresymbolication on OSX features = [ "rustc-dep-of-std", # enable build support for integrating into libstd |
