Skip to content

Commit 6adcdc3

Browse files
Rollup merge of #135070 - klensy:backtrace-deps, r=workingjubilee
std: sync to dep versions of backtrace Minor versions from backtrace desynced with std (they still differs in patch numbers, but still better): https://github.com/rust-lang/backtrace-rs/blob/4d7906bb24ae91ee6587127020d360f5298f9e7e/Cargo.toml#L44-L48 There is hidden bug here, let's see if CI can find it. cc `@workingjubilee`
2 parents 0da5bb4 + 4d3a028 commit 6adcdc3

File tree

3 files changed

+14
-25
lines changed

3 files changed

+14
-25
lines changed

Diff for: library/Cargo.lock

+10-21
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ version = 4
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.22.0"
7+
version = "0.24.2"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
9+
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
1010
dependencies = [
1111
"compiler_builtins",
12-
"gimli 0.29.0",
12+
"gimli",
1313
"rustc-std-workspace-alloc",
1414
"rustc-std-workspace-core",
1515
]
1616

1717
[[package]]
18-
name = "adler"
19-
version = "1.0.2"
18+
name = "adler2"
19+
version = "2.0.0"
2020
source = "registry+https://github.com/rust-lang/crates.io-index"
21-
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
21+
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
2222
dependencies = [
2323
"compiler_builtins",
2424
"rustc-std-workspace-core",
@@ -111,17 +111,6 @@ dependencies = [
111111
"unicode-width",
112112
]
113113

114-
[[package]]
115-
name = "gimli"
116-
version = "0.29.0"
117-
source = "registry+https://github.com/rust-lang/crates.io-index"
118-
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
119-
dependencies = [
120-
"compiler_builtins",
121-
"rustc-std-workspace-alloc",
122-
"rustc-std-workspace-core",
123-
]
124-
125114
[[package]]
126115
name = "gimli"
127116
version = "0.31.1"
@@ -177,11 +166,11 @@ dependencies = [
177166

178167
[[package]]
179168
name = "miniz_oxide"
180-
version = "0.7.4"
169+
version = "0.8.2"
181170
source = "registry+https://github.com/rust-lang/crates.io-index"
182-
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
171+
checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
183172
dependencies = [
184-
"adler",
173+
"adler2",
185174
"compiler_builtins",
186175
"rustc-std-workspace-alloc",
187176
"rustc-std-workspace-core",
@@ -408,7 +397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
408397
checksum = "51f06a05848f650946acef3bf525fe96612226b61f74ae23ffa4e98bfbb8ab3c"
409398
dependencies = [
410399
"compiler_builtins",
411-
"gimli 0.31.1",
400+
"gimli",
412401
"rustc-std-workspace-core",
413402
]
414403

Diff for: library/std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ std_detect = { path = "../stdarch/crates/std_detect", default-features = false,
3030
rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
3131

3232
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
33-
miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
34-
addr2line = { version = "0.22.0", optional = true, default-features = false }
33+
miniz_oxide = { version = "0.8.0", optional = true, default-features = false }
34+
addr2line = { version = "0.24.0", optional = true, default-features = false }
3535

3636
[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
3737
libc = { version = "0.2.169", default-features = false, features = [

Diff for: src/tools/tidy/src/deps.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const LICENSES: &[&str] = &[
1818
// tidy-alphabetical-start
1919
"(MIT OR Apache-2.0) AND Unicode-3.0", // unicode_ident (1.0.14)
2020
"(MIT OR Apache-2.0) AND Unicode-DFS-2016", // unicode_ident (1.0.12)
21-
"0BSD OR MIT OR Apache-2.0", // adler license
21+
"0BSD OR MIT OR Apache-2.0", // adler2 license
2222
"0BSD",
2323
"Apache-2.0 / MIT",
2424
"Apache-2.0 OR ISC OR MIT",
@@ -462,7 +462,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
462462
const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[
463463
// tidy-alphabetical-start
464464
"addr2line",
465-
"adler",
465+
"adler2",
466466
"allocator-api2",
467467
"cc",
468468
"cfg-if",

0 commit comments

Comments
 (0)