Skip to content

Commit 571c9fc

Browse files
committed
Auto merge of rust-lang#113176 - workingjubilee:backtrace-0.3.68, r=thomcc
Backtrace 0.3.68 Uptakes these releases: - https://github.com/rust-lang/backtrace-rs/releases/tag/0.3.68 r? `@thomcc`
2 parents 839e9a6 + 079949d commit 571c9fc

File tree

3 files changed

+23
-50
lines changed

3 files changed

+23
-50
lines changed

Cargo.lock

+19-46
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,16 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.19.0"
7+
version = "0.20.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
9+
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
1010
dependencies = [
1111
"compiler_builtins",
1212
"gimli 0.27.3",
1313
"rustc-std-workspace-alloc",
1414
"rustc-std-workspace-core",
1515
]
1616

17-
[[package]]
18-
name = "addr2line"
19-
version = "0.20.0"
20-
source = "registry+https://github.com/rust-lang/crates.io-index"
21-
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
22-
dependencies = [
23-
"gimli 0.27.3",
24-
]
25-
2617
[[package]]
2718
name = "adler"
2819
version = "1.0.2"
@@ -188,7 +179,7 @@ version = "0.1.4"
188179
source = "registry+https://github.com/rust-lang/crates.io-index"
189180
checksum = "74cfb39880a59e122232cb5fb06b20b4382d58c12fa9747d16f846d38a7b094c"
190181
dependencies = [
191-
"object 0.31.1",
182+
"object",
192183
]
193184

194185
[[package]]
@@ -258,12 +249,12 @@ version = "0.3.68"
258249
source = "registry+https://github.com/rust-lang/crates.io-index"
259250
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
260251
dependencies = [
261-
"addr2line 0.20.0",
252+
"addr2line",
262253
"cc",
263254
"cfg-if",
264255
"libc",
265-
"miniz_oxide 0.7.1",
266-
"object 0.31.1",
256+
"miniz_oxide",
257+
"object",
267258
"rustc-demangle",
268259
]
269260

@@ -1190,7 +1181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
11901181
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
11911182
dependencies = [
11921183
"crc32fast",
1193-
"miniz_oxide 0.7.1",
1184+
"miniz_oxide",
11941185
]
11951186

11961187
[[package]]
@@ -2153,25 +2144,16 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
21532144

21542145
[[package]]
21552146
name = "miniz_oxide"
2156-
version = "0.6.2"
2147+
version = "0.7.1"
21572148
source = "registry+https://github.com/rust-lang/crates.io-index"
2158-
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
2149+
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
21592150
dependencies = [
21602151
"adler",
21612152
"compiler_builtins",
21622153
"rustc-std-workspace-alloc",
21632154
"rustc-std-workspace-core",
21642155
]
21652156

2166-
[[package]]
2167-
name = "miniz_oxide"
2168-
version = "0.7.1"
2169-
source = "registry+https://github.com/rust-lang/crates.io-index"
2170-
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
2171-
dependencies = [
2172-
"adler",
2173-
]
2174-
21752157
[[package]]
21762158
name = "miow"
21772159
version = "0.5.0"
@@ -2266,29 +2248,20 @@ dependencies = [
22662248
"libc",
22672249
]
22682250

2269-
[[package]]
2270-
name = "object"
2271-
version = "0.30.4"
2272-
source = "registry+https://github.com/rust-lang/crates.io-index"
2273-
checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
2274-
dependencies = [
2275-
"compiler_builtins",
2276-
"memchr",
2277-
"rustc-std-workspace-alloc",
2278-
"rustc-std-workspace-core",
2279-
]
2280-
22812251
[[package]]
22822252
name = "object"
22832253
version = "0.31.1"
22842254
source = "registry+https://github.com/rust-lang/crates.io-index"
22852255
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
22862256
dependencies = [
2257+
"compiler_builtins",
22872258
"crc32fast",
22882259
"flate2",
22892260
"hashbrown 0.13.2",
22902261
"indexmap 1.9.3",
22912262
"memchr",
2263+
"rustc-std-workspace-alloc",
2264+
"rustc-std-workspace-core",
22922265
"ruzstd",
22932266
]
22942267

@@ -3115,7 +3088,7 @@ dependencies = [
31153088
"bitflags 1.3.2",
31163089
"libc",
31173090
"measureme",
3118-
"object 0.31.1",
3091+
"object",
31193092
"rustc-demangle",
31203093
"rustc_ast",
31213094
"rustc_attr",
@@ -3151,7 +3124,7 @@ dependencies = [
31513124
"itertools",
31523125
"jobserver",
31533126
"libc",
3154-
"object 0.31.1",
3127+
"object",
31553128
"pathdiff",
31563129
"regex",
31573130
"rustc_arena",
@@ -4082,7 +4055,7 @@ name = "rustc_target"
40824055
version = "0.0.0"
40834056
dependencies = [
40844057
"bitflags 1.3.2",
4085-
"object 0.31.1",
4058+
"object",
40864059
"rustc_abi",
40874060
"rustc_data_structures",
40884061
"rustc_feature",
@@ -4578,7 +4551,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
45784551
name = "std"
45794552
version = "0.0.0"
45804553
dependencies = [
4581-
"addr2line 0.19.0",
4554+
"addr2line",
45824555
"alloc",
45834556
"cfg-if",
45844557
"compiler_builtins",
@@ -4588,8 +4561,8 @@ dependencies = [
45884561
"hashbrown 0.14.0",
45894562
"hermit-abi 0.3.1",
45904563
"libc",
4591-
"miniz_oxide 0.6.2",
4592-
"object 0.30.4",
4564+
"miniz_oxide",
4565+
"object",
45934566
"panic_abort",
45944567
"panic_unwind",
45954568
"profiler_builtins",
@@ -4861,7 +4834,7 @@ checksum = "98c040e1340b889d4180c64e1d787efa9c32cb1617757e101480b61238b0d927"
48614834
dependencies = [
48624835
"gimli 0.26.2",
48634836
"hashbrown 0.12.3",
4864-
"object 0.31.1",
4837+
"object",
48654838
"tracing",
48664839
]
48674840

library/std/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
2626
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2727

2828
# Dependencies of the `backtrace` crate
29-
addr2line = { version = "0.19.0", optional = true, default-features = false }
29+
addr2line = { version = "0.20.0", optional = true, default-features = false }
3030
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
31-
miniz_oxide = { version = "0.6.0", optional = true, default-features = false, public = false }
31+
miniz_oxide = { version = "0.7.0", optional = true, default-features = false, public = false }
3232
[dependencies.object]
33-
version = "0.30.0"
33+
version = "0.31.1"
3434
optional = true
3535
default-features = false
3636
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']

0 commit comments

Comments
 (0)