Skip to content

Commit 817d2fe

Browse files
committed
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: rust-lang/backtrace-rs@0.3.25...0.3.29 Closes #61416
2 parents 81eb152 + fa1b6ad commit 817d2fe

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Cargo.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
112112

113113
[[package]]
114114
name = "backtrace"
115-
version = "0.3.25"
115+
version = "0.3.29"
116116
source = "registry+https://github.com/rust-lang/crates.io-index"
117117
dependencies = [
118118
"autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -837,15 +837,15 @@ name = "error-chain"
837837
version = "0.11.0"
838838
source = "registry+https://github.com/rust-lang/crates.io-index"
839839
dependencies = [
840-
"backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
840+
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
841841
]
842842

843843
[[package]]
844844
name = "error-chain"
845845
version = "0.12.0"
846846
source = "registry+https://github.com/rust-lang/crates.io-index"
847847
dependencies = [
848-
"backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
848+
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
849849
]
850850

851851
[[package]]
@@ -860,7 +860,7 @@ name = "failure"
860860
version = "0.1.5"
861861
source = "registry+https://github.com/rust-lang/crates.io-index"
862862
dependencies = [
863-
"backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
863+
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
864864
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
865865
]
866866

@@ -2375,7 +2375,7 @@ name = "rustc"
23752375
version = "0.0.0"
23762376
dependencies = [
23772377
"arena 0.0.0",
2378-
"backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
2378+
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
23792379
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
23802380
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
23812381
"chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3336,7 +3336,7 @@ name = "std"
33363336
version = "0.0.0"
33373337
dependencies = [
33383338
"alloc 0.0.0",
3339-
"backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
3339+
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
33403340
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
33413341
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
33423342
"core 0.0.0",
@@ -4120,7 +4120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41204120
"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"
41214121
"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
41224122
"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
4123-
"checksum backtrace 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)" = "1c50b4cb6d852a8567d98bb11c03f91ccec4dfbd88778bc1b92789c624081283"
4123+
"checksum backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "2d631cd7af21b7ff796293f1990104e3cdb606852863bac32f000c193aa35dfb"
41244124
"checksum backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea90dd7b012b3d1a2cb6bec16670a0db2c95d4e931e84f4047e0460c1b34c8d"
41254125
"checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a"
41264126
"checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf"

src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ unwind = { path = "../libunwind" }
2525
hashbrown = { version = "0.4.0", features = ['rustc-dep-of-std'] }
2626

2727
[dependencies.backtrace]
28-
version = "0.3.25"
28+
version = "0.3.29"
2929
default-features = false # don't use coresymbolication on OSX
3030
features = [
3131
"rustc-dep-of-std", # enable build support for integrating into libstd

0 commit comments

Comments
 (0)