Skip to content

Commit b2ce4f4

Browse files
authored
Rollup merge of #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 - https://github.com/rust-lang/flate2-rs/releases/tag/1.0.26 r? `@thomcc`
2 parents e084744 + 2150451 commit b2ce4f4

File tree

3 files changed

+21
-30
lines changed

3 files changed

+21
-30
lines changed

Cargo.lock

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ 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.2",
@@ -164,7 +164,7 @@ version = "0.1.4"
164164
source = "registry+https://github.com/rust-lang/crates.io-index"
165165
checksum = "74cfb39880a59e122232cb5fb06b20b4382d58c12fa9747d16f846d38a7b094c"
166166
dependencies = [
167-
"object 0.31.1",
167+
"object",
168168
]
169169

170170
[[package]]
@@ -230,16 +230,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
230230

231231
[[package]]
232232
name = "backtrace"
233-
version = "0.3.67"
233+
version = "0.3.68"
234234
source = "registry+https://github.com/rust-lang/crates.io-index"
235-
checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
235+
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
236236
dependencies = [
237237
"addr2line",
238238
"cc",
239239
"cfg-if",
240240
"libc",
241241
"miniz_oxide",
242-
"object 0.30.1",
242+
"object",
243243
"rustc-demangle",
244244
]
245245

@@ -1174,9 +1174,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
11741174

11751175
[[package]]
11761176
name = "flate2"
1177-
version = "1.0.25"
1177+
version = "1.0.26"
11781178
source = "registry+https://github.com/rust-lang/crates.io-index"
1179-
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
1179+
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
11801180
dependencies = [
11811181
"crc32fast",
11821182
"miniz_oxide",
@@ -2146,9 +2146,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
21462146

21472147
[[package]]
21482148
name = "miniz_oxide"
2149-
version = "0.6.2"
2149+
version = "0.7.1"
21502150
source = "registry+https://github.com/rust-lang/crates.io-index"
2151-
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
2151+
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
21522152
dependencies = [
21532153
"adler",
21542154
"compiler_builtins",
@@ -2260,29 +2260,20 @@ dependencies = [
22602260
"libc",
22612261
]
22622262

2263-
[[package]]
2264-
name = "object"
2265-
version = "0.30.1"
2266-
source = "registry+https://github.com/rust-lang/crates.io-index"
2267-
checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a"
2268-
dependencies = [
2269-
"compiler_builtins",
2270-
"memchr",
2271-
"rustc-std-workspace-alloc",
2272-
"rustc-std-workspace-core",
2273-
]
2274-
22752263
[[package]]
22762264
name = "object"
22772265
version = "0.31.1"
22782266
source = "registry+https://github.com/rust-lang/crates.io-index"
22792267
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
22802268
dependencies = [
2269+
"compiler_builtins",
22812270
"crc32fast",
22822271
"flate2",
22832272
"hashbrown 0.13.1",
22842273
"indexmap",
22852274
"memchr",
2275+
"rustc-std-workspace-alloc",
2276+
"rustc-std-workspace-core",
22862277
"ruzstd",
22872278
]
22882279

@@ -3104,7 +3095,7 @@ dependencies = [
31043095
"bitflags",
31053096
"libc",
31063097
"measureme",
3107-
"object 0.31.1",
3098+
"object",
31083099
"rustc-demangle",
31093100
"rustc_ast",
31103101
"rustc_attr",
@@ -3140,7 +3131,7 @@ dependencies = [
31403131
"itertools",
31413132
"jobserver",
31423133
"libc",
3143-
"object 0.31.1",
3134+
"object",
31443135
"pathdiff",
31453136
"regex",
31463137
"rustc_arena",
@@ -4561,7 +4552,7 @@ dependencies = [
45614552
"hermit-abi 0.3.0",
45624553
"libc",
45634554
"miniz_oxide",
4564-
"object 0.30.1",
4555+
"object",
45654556
"panic_abort",
45664557
"panic_unwind",
45674558
"profiler_builtins",
@@ -4832,7 +4823,7 @@ checksum = "98c040e1340b889d4180c64e1d787efa9c32cb1617757e101480b61238b0d927"
48324823
dependencies = [
48334824
"gimli 0.26.2",
48344825
"hashbrown 0.12.3",
4835-
"object 0.31.1",
4826+
"object",
48364827
"tracing",
48374828
]
48384829

library/std/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
2525
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2626

2727
# Dependencies of the `backtrace` crate
28-
addr2line = { version = "0.19.0", optional = true, default-features = false }
28+
addr2line = { version = "0.20.0", optional = true, default-features = false }
2929
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
30-
miniz_oxide = { version = "0.6.0", optional = true, default-features = false, public = false }
30+
miniz_oxide = { version = "0.7.0", optional = true, default-features = false, public = false }
3131
[dependencies.object]
32-
version = "0.30.0"
32+
version = "0.31.1"
3333
optional = true
3434
default-features = false
3535
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']

0 commit comments

Comments
 (0)