Skip to content

Commit 5473b6d

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 f811f14 + 2b0e27e commit 5473b6d

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

Cargo.lock

+19-22
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
254254

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

264264
[[package]]
@@ -629,15 +629,6 @@ dependencies = [
629629
"unicode-normalization",
630630
]
631631

632-
[[package]]
633-
name = "cloudabi"
634-
version = "0.1.0"
635-
source = "registry+https://github.com/rust-lang/crates.io-index"
636-
checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
637-
dependencies = [
638-
"bitflags",
639-
]
640-
641632
[[package]]
642633
name = "cmake"
643634
version = "0.1.44"
@@ -1939,6 +1930,12 @@ dependencies = [
19391930
"pkg-config",
19401931
]
19411932

1933+
[[package]]
1934+
name = "libm"
1935+
version = "0.1.4"
1936+
source = "registry+https://github.com/rust-lang/crates.io-index"
1937+
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
1938+
19421939
[[package]]
19431940
name = "libnghttp2-sys"
19441941
version = "0.1.4+1.41.0"
@@ -2482,12 +2479,13 @@ dependencies = [
24822479
]
24832480

24842481
[[package]]
2485-
name = "packed_simd"
2486-
version = "0.3.3"
2482+
name = "packed_simd_2"
2483+
version = "0.3.4"
24872484
source = "registry+https://github.com/rust-lang/crates.io-index"
2488-
checksum = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
2485+
checksum = "3278e0492f961fd4ae70909f56b2723a7e8d01a228427294e19cdfdebda89a17"
24892486
dependencies = [
24902487
"cfg-if 0.1.10",
2488+
"libm",
24912489
]
24922490

24932491
[[package]]
@@ -2530,9 +2528,9 @@ dependencies = [
25302528

25312529
[[package]]
25322530
name = "parking_lot"
2533-
version = "0.11.0"
2531+
version = "0.11.1"
25342532
source = "registry+https://github.com/rust-lang/crates.io-index"
2535-
checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
2533+
checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
25362534
dependencies = [
25372535
"instant",
25382536
"lock_api",
@@ -2541,15 +2539,14 @@ dependencies = [
25412539

25422540
[[package]]
25432541
name = "parking_lot_core"
2544-
version = "0.8.0"
2542+
version = "0.8.3"
25452543
source = "registry+https://github.com/rust-lang/crates.io-index"
2546-
checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
2544+
checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
25472545
dependencies = [
2548-
"cfg-if 0.1.10",
2549-
"cloudabi",
2546+
"cfg-if 1.0.0",
25502547
"instant",
25512548
"libc",
2552-
"redox_syscall 0.1.57",
2549+
"redox_syscall 0.2.5",
25532550
"smallvec 1.6.1",
25542551
"winapi 0.3.9",
25552552
]

src/tools/tidy/src/deps.rs

-2
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)