Skip to content

Commit 3adedb8

Browse files
committedNov 21, 2020
Auto merge of rust-lang#79237 - alexcrichton:update-backtrace, r=Mark-Simulacrum
std: Update the bactrace crate submodule This commit updates the `library/backtrace` submodule which primarily pulls in support for split-debuginfo on macOS, avoiding the need for `dsymutil` to get run to get line numbers and filenames in backtraces.
2 parents d806d65 + f99410b commit 3adedb8

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed
 

‎Cargo.lock

+10-16
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# It is not intended for manual editing.
33
[[package]]
44
name = "addr2line"
5-
version = "0.13.0"
5+
version = "0.14.0"
66
source = "registry+https://github.com/rust-lang/crates.io-index"
7-
checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
7+
checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
88
dependencies = [
99
"compiler_builtins",
1010
"gimli",
@@ -132,13 +132,13 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
132132

133133
[[package]]
134134
name = "backtrace"
135-
version = "0.3.53"
135+
version = "0.3.55"
136136
dependencies = [
137137
"addr2line",
138138
"cfg-if 1.0.0",
139139
"libc",
140140
"miniz_oxide",
141-
"object 0.21.1",
141+
"object",
142142
"rustc-demangle",
143143
]
144144

@@ -1292,9 +1292,9 @@ dependencies = [
12921292

12931293
[[package]]
12941294
name = "gimli"
1295-
version = "0.22.0"
1295+
version = "0.23.0"
12961296
source = "registry+https://github.com/rust-lang/crates.io-index"
1297-
checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
1297+
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
12981298
dependencies = [
12991299
"compiler_builtins",
13001300
"rustc-std-workspace-alloc",
@@ -2181,21 +2181,15 @@ dependencies = [
21812181

21822182
[[package]]
21832183
name = "object"
2184-
version = "0.20.0"
2184+
version = "0.22.0"
21852185
source = "registry+https://github.com/rust-lang/crates.io-index"
2186-
checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
2186+
checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
21872187
dependencies = [
21882188
"compiler_builtins",
21892189
"rustc-std-workspace-alloc",
21902190
"rustc-std-workspace-core",
21912191
]
21922192

2193-
[[package]]
2194-
name = "object"
2195-
version = "0.21.1"
2196-
source = "registry+https://github.com/rust-lang/crates.io-index"
2197-
checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
2198-
21992193
[[package]]
22002194
name = "once_cell"
22012195
version = "1.4.1"
@@ -4668,7 +4662,7 @@ dependencies = [
46684662
"hermit-abi",
46694663
"libc",
46704664
"miniz_oxide",
4671-
"object 0.20.0",
4665+
"object",
46724666
"panic_abort",
46734667
"panic_unwind",
46744668
"profiler_builtins",
@@ -5262,7 +5256,7 @@ dependencies = [
52625256
"chrono",
52635257
"lazy_static",
52645258
"matchers",
5265-
"parking_lot 0.9.0",
5259+
"parking_lot 0.11.0",
52665260
"regex",
52675261
"serde",
52685262
"serde_json",

‎library/std/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.9.0", default-features = false, features = ['rustc-dep-of-std'] }
2424

2525
# Dependencies of the `backtrace` crate
26-
addr2line = { version = "0.13.0", optional = true, default-features = false }
26+
addr2line = { version = "0.14.0", optional = true, default-features = false }
2727
rustc-demangle = { version = "0.1.18", features = ['rustc-dep-of-std'] }
2828
miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
2929
[dependencies.object]
30-
version = "0.20"
30+
version = "0.22"
3131
optional = true
3232
default-features = false
33-
features = ['read_core', 'elf', 'macho', 'pe']
33+
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
3434

3535
[dev-dependencies]
3636
rand = "0.7"

0 commit comments

Comments
 (0)
Please sign in to comment.