Skip to content

Commit eed8918

Browse files
committedNov 7, 2023
bump some deps
drop num_cpus from rust-installer as not used update rayon, rayon-core, which drops it's deps on num_cpus and crossbeam-channel (for bootstrap too) (https://github.com/rayon-rs/rayon/blob/v1.8.0/RELEASES.md) update erro, which drops errno-dragonfly (https://github.com/lambda-fairy/rust-errno/blob/5341791935df601306ffc57a665763c4ecd72755/CHANGELOG.md)
1 parent 114f1f6 commit eed8918

File tree

4 files changed

+10
-58
lines changed

4 files changed

+10
-58
lines changed
 

‎Cargo.lock

+6-20
Original file line numberDiff line numberDiff line change
@@ -1281,25 +1281,14 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
12811281

12821282
[[package]]
12831283
name = "errno"
1284-
version = "0.3.1"
1284+
version = "0.3.5"
12851285
source = "registry+https://github.com/rust-lang/crates.io-index"
1286-
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
1286+
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
12871287
dependencies = [
1288-
"errno-dragonfly",
12891288
"libc",
12901289
"windows-sys 0.48.0",
12911290
]
12921291

1293-
[[package]]
1294-
name = "errno-dragonfly"
1295-
version = "0.1.2"
1296-
source = "registry+https://github.com/rust-lang/crates.io-index"
1297-
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
1298-
dependencies = [
1299-
"cc",
1300-
"libc",
1301-
]
1302-
13031292
[[package]]
13041293
name = "error_index_generator"
13051294
version = "0.0.0"
@@ -2055,7 +2044,6 @@ dependencies = [
20552044
"anyhow",
20562045
"clap",
20572046
"flate2",
2058-
"num_cpus",
20592047
"rayon",
20602048
"tar",
20612049
"walkdir",
@@ -3181,24 +3169,22 @@ dependencies = [
31813169

31823170
[[package]]
31833171
name = "rayon"
3184-
version = "1.7.0"
3172+
version = "1.8.0"
31853173
source = "registry+https://github.com/rust-lang/crates.io-index"
3186-
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
3174+
checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
31873175
dependencies = [
31883176
"either",
31893177
"rayon-core",
31903178
]
31913179

31923180
[[package]]
31933181
name = "rayon-core"
3194-
version = "1.11.0"
3182+
version = "1.12.0"
31953183
source = "registry+https://github.com/rust-lang/crates.io-index"
3196-
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
3184+
checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
31973185
dependencies = [
3198-
"crossbeam-channel",
31993186
"crossbeam-deque",
32003187
"crossbeam-utils",
3201-
"num_cpus",
32023188
]
32033189

32043190
[[package]]

‎src/bootstrap/Cargo.lock

+4-36
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,6 @@ dependencies = [
180180
"libc",
181181
]
182182

183-
[[package]]
184-
name = "crossbeam-channel"
185-
version = "0.5.6"
186-
source = "registry+https://github.com/rust-lang/crates.io-index"
187-
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
188-
dependencies = [
189-
"cfg-if",
190-
"crossbeam-utils",
191-
]
192-
193183
[[package]]
194184
name = "crossbeam-deque"
195185
version = "0.8.2"
@@ -323,15 +313,6 @@ version = "0.4.1"
323313
source = "registry+https://github.com/rust-lang/crates.io-index"
324314
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
325315

326-
[[package]]
327-
name = "hermit-abi"
328-
version = "0.1.19"
329-
source = "registry+https://github.com/rust-lang/crates.io-index"
330-
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
331-
dependencies = [
332-
"libc",
333-
]
334-
335316
[[package]]
336317
name = "hex"
337318
version = "0.4.3"
@@ -443,16 +424,6 @@ dependencies = [
443424
"winapi",
444425
]
445426

446-
[[package]]
447-
name = "num_cpus"
448-
version = "1.13.1"
449-
source = "registry+https://github.com/rust-lang/crates.io-index"
450-
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
451-
dependencies = [
452-
"hermit-abi",
453-
"libc",
454-
]
455-
456427
[[package]]
457428
name = "object"
458429
version = "0.32.0"
@@ -514,25 +485,22 @@ dependencies = [
514485

515486
[[package]]
516487
name = "rayon"
517-
version = "1.6.0"
488+
version = "1.8.0"
518489
source = "registry+https://github.com/rust-lang/crates.io-index"
519-
checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
490+
checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
520491
dependencies = [
521-
"crossbeam-deque",
522492
"either",
523493
"rayon-core",
524494
]
525495

526496
[[package]]
527497
name = "rayon-core"
528-
version = "1.10.1"
498+
version = "1.12.0"
529499
source = "registry+https://github.com/rust-lang/crates.io-index"
530-
checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
500+
checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
531501
dependencies = [
532-
"crossbeam-channel",
533502
"crossbeam-deque",
534503
"crossbeam-utils",
535-
"num_cpus",
536504
]
537505

538506
[[package]]

‎src/tools/rust-installer/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ rayon = "1.0"
1616
tar = "0.4.38"
1717
walkdir = "2"
1818
xz2 = "0.1.4"
19-
num_cpus = "1"
2019

2120
[dependencies.clap]
2221
features = ["derive"]

‎src/tools/tidy/src/deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
228228
"ena",
229229
"equivalent",
230230
"errno",
231-
"errno-dragonfly",
232231
"expect-test",
233232
"fallible-iterator", // dependency of `thorin`
234233
"fastrand",

0 commit comments

Comments
 (0)
Please sign in to comment.