Skip to content

Commit bfb44c8

Browse files
committed
Auto merge of #140705 - LegNeato:backtracelock, r=Mark-Simulacrum
Update `backtrace` in Cargo.lock Ran `cargo update -p backtrace`. This is needed to forward port the rust-gpu compiler backend. Subsumes #140631. Was supposed to be fixed by #140353, but there were test failures and the backtrace update was backed out.
2 parents c6faa1b + d4862eb commit bfb44c8

File tree

1 file changed

+17
-32
lines changed

1 file changed

+17
-32
lines changed

Cargo.lock

+17-32
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ version = 4
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.21.0"
7+
version = "0.24.2"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
9+
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
1010
dependencies = [
11-
"gimli 0.28.1",
11+
"gimli",
1212
]
1313

1414
[[package]]
@@ -168,7 +168,7 @@ version = "0.4.2"
168168
source = "registry+https://github.com/rust-lang/crates.io-index"
169169
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
170170
dependencies = [
171-
"object 0.36.7",
171+
"object",
172172
]
173173

174174
[[package]]
@@ -233,17 +233,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
233233

234234
[[package]]
235235
name = "backtrace"
236-
version = "0.3.71"
236+
version = "0.3.75"
237237
source = "registry+https://github.com/rust-lang/crates.io-index"
238-
checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
238+
checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
239239
dependencies = [
240240
"addr2line",
241-
"cc",
242241
"cfg-if",
243242
"libc",
244-
"miniz_oxide 0.7.4",
245-
"object 0.32.2",
243+
"miniz_oxide 0.8.8",
244+
"object",
246245
"rustc-demangle",
246+
"windows-targets 0.52.6",
247247
]
248248

249249
[[package]]
@@ -1453,12 +1453,6 @@ dependencies = [
14531453
"wasi 0.14.2+wasi-0.2.4",
14541454
]
14551455

1456-
[[package]]
1457-
name = "gimli"
1458-
version = "0.28.1"
1459-
source = "registry+https://github.com/rust-lang/crates.io-index"
1460-
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
1461-
14621456
[[package]]
14631457
name = "gimli"
14641458
version = "0.31.1"
@@ -2483,15 +2477,6 @@ dependencies = [
24832477
"objc2-core-foundation",
24842478
]
24852479

2486-
[[package]]
2487-
name = "object"
2488-
version = "0.32.2"
2489-
source = "registry+https://github.com/rust-lang/crates.io-index"
2490-
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
2491-
dependencies = [
2492-
"memchr",
2493-
]
2494-
24952480
[[package]]
24962481
name = "object"
24972482
version = "0.36.7"
@@ -3093,9 +3078,9 @@ version = "0.2.0"
30933078
dependencies = [
30943079
"bstr",
30953080
"build_helper",
3096-
"gimli 0.31.1",
3081+
"gimli",
30973082
"libc",
3098-
"object 0.36.7",
3083+
"object",
30993084
"regex",
31003085
"serde_json",
31013086
"similar",
@@ -3402,11 +3387,11 @@ name = "rustc_codegen_llvm"
34023387
version = "0.0.0"
34033388
dependencies = [
34043389
"bitflags",
3405-
"gimli 0.31.1",
3390+
"gimli",
34063391
"itertools",
34073392
"libc",
34083393
"measureme",
3409-
"object 0.36.7",
3394+
"object",
34103395
"rustc-demangle",
34113396
"rustc_abi",
34123397
"rustc_ast",
@@ -3447,7 +3432,7 @@ dependencies = [
34473432
"either",
34483433
"itertools",
34493434
"libc",
3450-
"object 0.36.7",
3435+
"object",
34513436
"pathdiff",
34523437
"regex",
34533438
"rustc_abi",
@@ -4464,7 +4449,7 @@ name = "rustc_target"
44644449
version = "0.0.0"
44654450
dependencies = [
44664451
"bitflags",
4467-
"object 0.36.7",
4452+
"object",
44684453
"rustc_abi",
44694454
"rustc_data_structures",
44704455
"rustc_fs_util",
@@ -5228,9 +5213,9 @@ version = "0.9.0"
52285213
source = "registry+https://github.com/rust-lang/crates.io-index"
52295214
checksum = "9e9c1e705f82a260173f3eec93f2ff6d7807f23ad5a8cc2e7316a891733ea7a1"
52305215
dependencies = [
5231-
"gimli 0.31.1",
5216+
"gimli",
52325217
"hashbrown",
5233-
"object 0.36.7",
5218+
"object",
52345219
"tracing",
52355220
]
52365221

0 commit comments

Comments
 (0)