Skip to content

Commit 91c019e

Browse files
authored
Rollup merge of #83239 - JohnTitor:reduce-deps, r=Mark-Simulacrum
Remove/replace some outdated crates from the dependency tree - Remove `cloudabi` by updating `parking_lot` to 0.11.1. - Replace `packed_simd` with `packed_simd2` by updating `bytecount` to 0.6.2.
2 parents bfd56fa + 2b0e27e commit 91c019e

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

Cargo.lock

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
252252

253253
[[package]]
254254
name = "bytecount"
255-
version = "0.6.0"
255+
version = "0.6.2"
256256
source = "registry+https://github.com/rust-lang/crates.io-index"
257-
checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
257+
checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"
258258
dependencies = [
259-
"packed_simd",
259+
"packed_simd_2",
260260
]
261261

262262
[[package]]
@@ -610,15 +610,6 @@ dependencies = [
610610
"unicode-normalization",
611611
]
612612

613-
[[package]]
614-
name = "cloudabi"
615-
version = "0.1.0"
616-
source = "registry+https://github.com/rust-lang/crates.io-index"
617-
checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
618-
dependencies = [
619-
"bitflags",
620-
]
621-
622613
[[package]]
623614
name = "cmake"
624615
version = "0.1.44"
@@ -1920,6 +1911,12 @@ dependencies = [
19201911
"pkg-config",
19211912
]
19221913

1914+
[[package]]
1915+
name = "libm"
1916+
version = "0.1.4"
1917+
source = "registry+https://github.com/rust-lang/crates.io-index"
1918+
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
1919+
19231920
[[package]]
19241921
name = "libnghttp2-sys"
19251922
version = "0.1.4+1.41.0"
@@ -2463,12 +2460,13 @@ dependencies = [
24632460
]
24642461

24652462
[[package]]
2466-
name = "packed_simd"
2467-
version = "0.3.3"
2463+
name = "packed_simd_2"
2464+
version = "0.3.4"
24682465
source = "registry+https://github.com/rust-lang/crates.io-index"
2469-
checksum = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
2466+
checksum = "3278e0492f961fd4ae70909f56b2723a7e8d01a228427294e19cdfdebda89a17"
24702467
dependencies = [
24712468
"cfg-if 0.1.10",
2469+
"libm",
24722470
]
24732471

24742472
[[package]]
@@ -2511,9 +2509,9 @@ dependencies = [
25112509

25122510
[[package]]
25132511
name = "parking_lot"
2514-
version = "0.11.0"
2512+
version = "0.11.1"
25152513
source = "registry+https://github.com/rust-lang/crates.io-index"
2516-
checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
2514+
checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
25172515
dependencies = [
25182516
"instant",
25192517
"lock_api",
@@ -2522,15 +2520,14 @@ dependencies = [
25222520

25232521
[[package]]
25242522
name = "parking_lot_core"
2525-
version = "0.8.0"
2523+
version = "0.8.3"
25262524
source = "registry+https://github.com/rust-lang/crates.io-index"
2527-
checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
2525+
checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
25282526
dependencies = [
2529-
"cfg-if 0.1.10",
2530-
"cloudabi",
2527+
"cfg-if 1.0.0",
25312528
"instant",
25322529
"libc",
2533-
"redox_syscall 0.1.57",
2530+
"redox_syscall 0.2.5",
25342531
"smallvec 1.6.1",
25352532
"winapi 0.3.9",
25362533
]

src/tools/tidy/src/deps.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const EXCEPTIONS: &[(&str, &str)] = &[
3232
("fuchsia-zircon", "BSD-3-Clause"), // rustdoc, rustc, cargo (jobserver & tempdir)
3333
("colored", "MPL-2.0"), // rustfmt
3434
("ordslice", "Apache-2.0"), // rls
35-
("cloudabi", "BSD-2-Clause"), // (rls -> crossbeam-channel 0.2 -> rand 0.5)
3635
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
3736
("bytesize", "Apache-2.0"), // cargo
3837
("im-rc", "MPL-2.0+"), // cargo
@@ -76,7 +75,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
7675
"cfg-if",
7776
"chalk-derive",
7877
"chalk-ir",
79-
"cloudabi",
8078
"cmake",
8179
"compiler_builtins",
8280
"cpuid-bool",

0 commit comments

Comments
 (0)