Skip to content

Commit 537544b

Browse files
committed
Auto merge of #84498 - workingjubilee:update-grab-bag, r=Mark-Simulacrum
Update grab bag This PR slides a bunch of crate versions forward until suddenly a bunch of deps fall out of the tree! In doing so this mostly picks up a version bump in the `redox_users` crate which makes most of the features default to optional. crossbeam-utils 0.7 => 0.8.3 (where applicable) https://github.com/crossbeam-rs/crossbeam/blob/master/crossbeam-utils/CHANGELOG.md directories 3.0.1 => 3.0.2 ignore 0.4.16 => 0.4.17 tempfile 3.0.5 => tempfile 3.2 Removes constant_time_eq from deps exceptions Removes arrayref from deps exceptions And also removes: - blake2b_simd - const_fn (the package, not the feature) - constant_time_eq - redox_users 0.3.4 - rust-argon2
2 parents 27bd3f5 + 7d3186d commit 537544b

File tree

6 files changed

+28
-87
lines changed

6 files changed

+28
-87
lines changed

Cargo.lock

+22-80
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ version = "1.0.3"
103103
source = "registry+https://github.com/rust-lang/crates.io-index"
104104
checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
105105

106-
[[package]]
107-
name = "arrayref"
108-
version = "0.3.6"
109-
source = "registry+https://github.com/rust-lang/crates.io-index"
110-
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
111-
112106
[[package]]
113107
name = "arrayvec"
114108
version = "0.5.2"
@@ -138,12 +132,6 @@ version = "1.0.0"
138132
source = "registry+https://github.com/rust-lang/crates.io-index"
139133
checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
140134

141-
[[package]]
142-
name = "base64"
143-
version = "0.11.0"
144-
source = "registry+https://github.com/rust-lang/crates.io-index"
145-
checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
146-
147135
[[package]]
148136
name = "bitflags"
149137
version = "1.2.1"
@@ -159,17 +147,6 @@ dependencies = [
159147
"typenum",
160148
]
161149

162-
[[package]]
163-
name = "blake2b_simd"
164-
version = "0.5.10"
165-
source = "registry+https://github.com/rust-lang/crates.io-index"
166-
checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
167-
dependencies = [
168-
"arrayref",
169-
"arrayvec 0.5.2",
170-
"constant_time_eq",
171-
]
172-
173150
[[package]]
174151
name = "block-buffer"
175152
version = "0.7.3"
@@ -298,7 +275,7 @@ dependencies = [
298275
"cargo-util",
299276
"clap",
300277
"crates-io",
301-
"crossbeam-utils 0.8.0",
278+
"crossbeam-utils 0.8.3",
302279
"curl",
303280
"curl-sys",
304281
"env_logger 0.8.1",
@@ -729,18 +706,6 @@ dependencies = [
729706
"winapi 0.3.9",
730707
]
731708

732-
[[package]]
733-
name = "const_fn"
734-
version = "0.4.3"
735-
source = "registry+https://github.com/rust-lang/crates.io-index"
736-
checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
737-
738-
[[package]]
739-
name = "constant_time_eq"
740-
version = "0.1.5"
741-
source = "registry+https://github.com/rust-lang/crates.io-index"
742-
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
743-
744709
[[package]]
745710
name = "core"
746711
version = "0.0.0"
@@ -802,7 +767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
802767
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
803768
dependencies = [
804769
"cfg-if 1.0.0",
805-
"crossbeam-utils 0.8.0",
770+
"crossbeam-utils 0.8.3",
806771
]
807772

808773
[[package]]
@@ -855,13 +820,12 @@ dependencies = [
855820

856821
[[package]]
857822
name = "crossbeam-utils"
858-
version = "0.8.0"
823+
version = "0.8.3"
859824
source = "registry+https://github.com/rust-lang/crates.io-index"
860-
checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
825+
checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
861826
dependencies = [
862827
"autocfg",
863828
"cfg-if 1.0.0",
864-
"const_fn",
865829
"lazy_static",
866830
]
867831

@@ -988,9 +952,9 @@ dependencies = [
988952

989953
[[package]]
990954
name = "directories"
991-
version = "3.0.1"
955+
version = "3.0.2"
992956
source = "registry+https://github.com/rust-lang/crates.io-index"
993-
checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
957+
checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
994958
dependencies = [
995959
"dirs-sys",
996960
]
@@ -1017,12 +981,12 @@ dependencies = [
1017981

1018982
[[package]]
1019983
name = "dirs-sys"
1020-
version = "0.3.5"
984+
version = "0.3.6"
1021985
source = "registry+https://github.com/rust-lang/crates.io-index"
1022-
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
986+
checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
1023987
dependencies = [
1024988
"libc",
1025-
"redox_users 0.3.4",
989+
"redox_users",
1026990
"winapi 0.3.9",
1027991
]
1028992

@@ -1033,7 +997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1033997
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
1034998
dependencies = [
1035999
"libc",
1036-
"redox_users 0.4.0",
1000+
"redox_users",
10371001
"winapi 0.3.9",
10381002
]
10391003

@@ -1649,11 +1613,11 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
16491613

16501614
[[package]]
16511615
name = "ignore"
1652-
version = "0.4.16"
1616+
version = "0.4.17"
16531617
source = "registry+https://github.com/rust-lang/crates.io-index"
1654-
checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72"
1618+
checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
16551619
dependencies = [
1656-
"crossbeam-utils 0.7.2",
1620+
"crossbeam-utils 0.8.3",
16571621
"globset",
16581622
"lazy_static",
16591623
"log",
@@ -3049,17 +3013,6 @@ dependencies = [
30493013
"bitflags",
30503014
]
30513015

3052-
[[package]]
3053-
name = "redox_users"
3054-
version = "0.3.4"
3055-
source = "registry+https://github.com/rust-lang/crates.io-index"
3056-
checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
3057-
dependencies = [
3058-
"getrandom 0.1.14",
3059-
"redox_syscall 0.1.57",
3060-
"rust-argon2",
3061-
]
3062-
30633016
[[package]]
30643017
name = "redox_users"
30653018
version = "0.4.0"
@@ -3236,18 +3189,6 @@ dependencies = [
32363189
"rls-span",
32373190
]
32383191

3239-
[[package]]
3240-
name = "rust-argon2"
3241-
version = "0.7.0"
3242-
source = "registry+https://github.com/rust-lang/crates.io-index"
3243-
checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
3244-
dependencies = [
3245-
"base64",
3246-
"blake2b_simd",
3247-
"constant_time_eq",
3248-
"crossbeam-utils 0.7.2",
3249-
]
3250-
32513192
[[package]]
32523193
name = "rust-demangler"
32533194
version = "0.0.1"
@@ -3653,11 +3594,12 @@ name = "rustc-workspace-hack"
36533594
version = "1.0.0"
36543595
dependencies = [
36553596
"byteorder",
3656-
"crossbeam-utils 0.7.2",
3597+
"crossbeam-utils 0.8.3",
36573598
"libc",
36583599
"libz-sys",
36593600
"proc-macro2",
36603601
"quote",
3602+
"rand_core 0.5.1",
36613603
"serde",
36623604
"serde_json",
36633605
"smallvec",
@@ -3845,7 +3787,7 @@ dependencies = [
38453787
"arrayvec 0.7.0",
38463788
"bitflags",
38473789
"cfg-if 0.1.10",
3848-
"crossbeam-utils 0.7.2",
3790+
"crossbeam-utils 0.8.3",
38493791
"ena",
38503792
"indexmap",
38513793
"jobserver",
@@ -5163,14 +5105,14 @@ dependencies = [
51635105

51645106
[[package]]
51655107
name = "tempfile"
5166-
version = "3.1.0"
5108+
version = "3.2.0"
51675109
source = "registry+https://github.com/rust-lang/crates.io-index"
5168-
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
5110+
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
51695111
dependencies = [
5170-
"cfg-if 0.1.10",
5112+
"cfg-if 1.0.0",
51715113
"libc",
5172-
"rand 0.7.3",
5173-
"redox_syscall 0.1.57",
5114+
"rand 0.8.3",
5115+
"redox_syscall 0.2.5",
51745116
"remove_dir_all",
51755117
"winapi 0.3.9",
51765118
]
@@ -5305,7 +5247,7 @@ name = "tidy"
53055247
version = "0.1.0"
53065248
dependencies = [
53075249
"cargo_metadata 0.11.1",
5308-
"crossbeam-utils 0.8.0",
5250+
"crossbeam-utils 0.8.3",
53095251
"lazy_static",
53105252
"regex",
53115253
"walkdir",

compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ itertools = "0.9"
1414
tracing = "0.1"
1515
libc = "0.2.50"
1616
jobserver = "0.1.22"
17-
tempfile = "3.1"
17+
tempfile = "3.2"
1818
pathdiff = "0.2.0"
1919

2020
rustc_serialize = { path = "../rustc_serialize" }

compiler/rustc_data_structures/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rustc_serialize = { path = "../rustc_serialize" }
1717
rustc_macros = { path = "../rustc_macros" }
1818
rustc_graphviz = { path = "../rustc_graphviz" }
1919
cfg-if = "0.1.2"
20-
crossbeam-utils = { version = "0.7", features = ["nightly"] }
20+
crossbeam-utils = { version = "0.8", features = ["nightly"] }
2121
stable_deref_trait = "1.0.0"
2222
rayon = { version = "0.3.1", package = "rustc-rayon" }
2323
rayon-core = { version = "0.3.1", package = "rustc-rayon-core" }
@@ -28,7 +28,7 @@ bitflags = "1.2.1"
2828
measureme = "9.1.0"
2929
libc = "0.2"
3030
stacker = "0.1.12"
31-
tempfile = "3.0.5"
31+
tempfile = "3.2"
3232

3333
[dependencies.parking_lot]
3434
version = "0.11"

compiler/rustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rustc_query_impl = { path = "../rustc_query_impl" }
4545
rustc_resolve = { path = "../rustc_resolve" }
4646
rustc_trait_selection = { path = "../rustc_trait_selection" }
4747
rustc_ty_utils = { path = "../rustc_ty_utils" }
48-
tempfile = "3.0.5"
48+
tempfile = "3.2"
4949

5050
[target.'cfg(windows)'.dependencies]
5151
winapi = { version = "0.3", features = ["libloaderapi"] }

src/tools/rustc-workspace-hack/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ features = [
6363
[dependencies]
6464
byteorder = { version = "1", features = ['default', 'std'] }
6565
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
66-
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
66+
crossbeam-utils = { version = "0.8.0", features = ["nightly"] }
6767
libc = { version = "0.2.79", features = ["align"] }
6868
# Ensure default features of libz-sys, which are disabled in some scenarios.
6969
libz-sys = { version = "1.1.2" }
7070
proc-macro2 = { version = "1", features = ["default"] }
7171
quote = { version = "1", features = ["default"] }
72+
rand_core_0_5 = { package = "rand_core", version = "0.5.1", features = ["getrandom", "alloc", "std"] }
7273
serde = { version = "1.0.82", features = ['derive'] }
7374
serde_json = { version = "1.0.31", features = ["raw_value", "unbounded_depth"] }
7475
smallvec = { version = "1.6.1", features = ['union', 'may_dangle'] }

src/tools/tidy/src/deps.rs

-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ const EXCEPTIONS: &[(&str, &str)] = &[
3535
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
3636
("bytesize", "Apache-2.0"), // cargo
3737
("im-rc", "MPL-2.0+"), // cargo
38-
("constant_time_eq", "CC0-1.0"), // rustfmt
3938
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
4039
("bitmaps", "MPL-2.0+"), // cargo via im-rc
4140
("crossbeam-queue", "MIT/Apache-2.0 AND BSD-2-Clause"), // rls via rayon
42-
("arrayref", "BSD-2-Clause"), // cargo-miri/directories/.../rust-argon2 (redox)
4341
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
4442
("snap", "BSD-3-Clause"), // rustc
4543
// FIXME: this dependency violates the documentation comment above:

0 commit comments

Comments
 (0)