Skip to content

Commit 84e9189

Browse files
committed
Auto merge of rust-lang#92896 - lqd:update-deps, r=Mark-Simulacrum
Update some rustc dependencies to deduplicate them This PR updates `rand` and `itertools` in rustc (not the whole workspace) in order to deduplicate them (and hopefully slightly improve compile times). ~~Currently, `object` is still duplicated, but rust-lang/thorin#15 and updating `thorin` in the future will remove the use of version 0.27.~~ Update: Thorin 0.2 has now been released, and this PR updates `rustc_codegen_ssa` to use it and deduplicate the `object` crate. There's a final tiny rustc dependency, `cfg-if`, which will be left: as both versions 0.1.x and 1.0 looked to be heavily depended on, they will require a few cascading updates to be removed.
2 parents 0bcacb3 + 820fd05 commit 84e9189

File tree

6 files changed

+18
-29
lines changed

6 files changed

+18
-29
lines changed

Cargo.lock

+12-23
Original file line numberDiff line numberDiff line change
@@ -1582,9 +1582,9 @@ dependencies = [
15821582

15831583
[[package]]
15841584
name = "hashbrown"
1585-
version = "0.11.0"
1585+
version = "0.11.2"
15861586
source = "registry+https://github.com/rust-lang/crates.io-index"
1587-
checksum = "362385356d610bd1e5a408ddf8d022041774b683f345a1d2cfcb4f60f8ae2db5"
1587+
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
15881588
dependencies = [
15891589
"ahash",
15901590
"compiler_builtins",
@@ -2403,25 +2403,14 @@ dependencies = [
24032403
"rustc-std-workspace-core",
24042404
]
24052405

2406-
[[package]]
2407-
name = "object"
2408-
version = "0.27.1"
2409-
source = "registry+https://github.com/rust-lang/crates.io-index"
2410-
checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
2411-
dependencies = [
2412-
"crc32fast",
2413-
"flate2",
2414-
"indexmap",
2415-
"memchr",
2416-
]
2417-
24182406
[[package]]
24192407
name = "object"
24202408
version = "0.28.1"
24212409
source = "registry+https://github.com/rust-lang/crates.io-index"
24222410
checksum = "7ce8b38d41f9f3618fc23f908faae61510f8d8ce2d99cbe910641e8f1971f084"
24232411
dependencies = [
24242412
"crc32fast",
2413+
"flate2",
24252414
"hashbrown",
24262415
"indexmap",
24272416
"memchr",
@@ -3440,7 +3429,7 @@ dependencies = [
34403429
name = "rustc_ast_passes"
34413430
version = "0.0.0"
34423431
dependencies = [
3443-
"itertools 0.9.0",
3432+
"itertools 0.10.1",
34443433
"rustc_ast",
34453434
"rustc_ast_pretty",
34463435
"rustc_attr",
@@ -3483,7 +3472,7 @@ name = "rustc_borrowck"
34833472
version = "0.0.0"
34843473
dependencies = [
34853474
"either",
3486-
"itertools 0.9.0",
3475+
"itertools 0.10.1",
34873476
"polonius-engine",
34883477
"rustc_const_eval",
34893478
"rustc_data_structures",
@@ -3564,7 +3553,7 @@ version = "0.0.0"
35643553
dependencies = [
35653554
"bitflags",
35663555
"cc",
3567-
"itertools 0.9.0",
3556+
"itertools 0.10.1",
35683557
"jobserver",
35693558
"libc",
35703559
"object 0.28.1",
@@ -3772,7 +3761,7 @@ dependencies = [
37723761
name = "rustc_incremental"
37733762
version = "0.0.0"
37743763
dependencies = [
3775-
"rand 0.7.3",
3764+
"rand 0.8.4",
37763765
"rustc_ast",
37773766
"rustc_data_structures",
37783767
"rustc_errors",
@@ -4048,7 +4037,7 @@ name = "rustc_mir_transform"
40484037
version = "0.0.0"
40494038
dependencies = [
40504039
"coverage_test_macros",
4051-
"itertools 0.9.0",
4040+
"itertools 0.10.1",
40524041
"rustc_ast",
40534042
"rustc_attr",
40544043
"rustc_const_eval",
@@ -5113,13 +5102,13 @@ dependencies = [
51135102

51145103
[[package]]
51155104
name = "thorin-dwp"
5116-
version = "0.1.1"
5105+
version = "0.2.0"
51175106
source = "registry+https://github.com/rust-lang/crates.io-index"
5118-
checksum = "039d1fc0bfdb73910c2702893515580e38c192f47a987bc98ddd38a36f2d953a"
5107+
checksum = "dd95b4559c196987c8451b4e14d08a4c796c2844f9adf4d2a2dbc9b3142843be"
51195108
dependencies = [
51205109
"gimli 0.26.1",
5121-
"indexmap",
5122-
"object 0.27.1",
5110+
"hashbrown",
5111+
"object 0.28.1",
51235112
"tracing",
51245113
]
51255114

compiler/rustc_ast_passes/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
itertools = "0.9"
7+
itertools = "0.10"
88
tracing = "0.1"
99
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1010
rustc_attr = { path = "../rustc_attr" }

compiler/rustc_borrowck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ doctest = false
88

99
[dependencies]
1010
either = "1.5.0"
11-
itertools = "0.9"
11+
itertools = "0.10"
1212
tracing = "0.1"
1313
polonius-engine = "0.13.0"
1414
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

compiler/rustc_codegen_ssa/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ test = false
99
[dependencies]
1010
bitflags = "1.2.1"
1111
cc = "1.0.69"
12-
itertools = "0.9"
12+
itertools = "0.10"
1313
tracing = "0.1"
1414
libc = "0.2.50"
1515
jobserver = "0.1.22"
1616
tempfile = "3.2"
17-
thorin-dwp = "0.1.1"
17+
thorin-dwp = "0.2"
1818
pathdiff = "0.2.0"
1919
snap = "1"
2020
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

compiler/rustc_incremental/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ doctest = false
99
[dependencies]
1010
rustc_graphviz = { path = "../rustc_graphviz" }
1111
tracing = "0.1"
12-
rand = "0.7"
12+
rand = "0.8.4"
1313
rustc_middle = { path = "../rustc_middle" }
1414
rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_hir = { path = "../rustc_hir" }

compiler/rustc_mir_transform/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
doctest = false
88

99
[dependencies]
10-
itertools = "0.9"
10+
itertools = "0.10"
1111
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
1212
tracing = "0.1"
1313
rustc_ast = { path = "../rustc_ast" }

0 commit comments

Comments
 (0)