Skip to content

Commit 659e169

Browse files
committedJan 4, 2023
Auto merge of #106330 - weihanglo:update-cargo, r=weihanglo
Update cargo 8 commits in 2381cbdb4e9b07090f552d34a44a529b6e620e44..8c460b2237a6359a7e3335890db8da049bdd62fc 2022-12-23 12:19:27 +0000 to 2023-01-04 14:30:01 +0000 - test: revive nightly plugin tests to work (rust-lang/cargo#11534) - Add note to release notes about rejecting multiple registries. (rust-lang/cargo#11531) - Fix a typo `fresheness` -> `freshness` (rust-lang/cargo#11529) - Reasons for rebuilding (rust-lang/cargo#11407) - Asymmetric tokens (rust-lang/cargo#10771) - Use proper git URL for GitHub repos (rust-lang/cargo#11517) - Add `registry.default` example (rust-lang/cargo#11516) - Support vendoring with different revs from same git repo (rust-lang/cargo#10690) Also update license exceptions and permitted dependencies for new cargo dependency "pasetors". A new dependency `getrandom` is added into `rustc-workspace-hacks`, since it requires feature `js`. r? `@ghost`
2 parents b7cdb63 + 6306fd3 commit 659e169

File tree

4 files changed

+391
-17
lines changed

4 files changed

+391
-17
lines changed
 

‎Cargo.lock

Lines changed: 376 additions & 16 deletions
Original file line numberDiff line numberDiff line change

‎src/tools/cargo

Submodule cargo updated 47 files

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ clap = { version = "3.1.1", features = ["derive", "clap_derive"]}
7777
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
7878
# Ensure `extra_traits` of libc, which is used transitively by Cargo.
7979
libc = { version = "0.2", features = ["extra_traits"] }
80+
# Ensure `js` of getrandom, which is (unfortunately) used transitively by Cargo.
81+
getrandom = { version = "0.2", features = ["js"] }
8082
# Ensure default features of libz-sys, which are disabled in some scenarios.
8183
libz-sys = { version = "1.1.2" }
8284
# Ensure default features of regex, which are disabled in some scenarios.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ const EXCEPTIONS: &[(&str, &str)] = &[
4040
("im-rc", "MPL-2.0+"), // cargo
4141
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
4242
("bitmaps", "MPL-2.0+"), // cargo via im-rc
43+
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"), // cargo via pasetors
44+
("subtle", "BSD-3-Clause"), // cargo via pasetors
4345
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
4446
("snap", "BSD-3-Clause"), // rustc
4547
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
@@ -96,6 +98,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
9698
"autocfg",
9799
"bitflags",
98100
"block-buffer",
101+
"bumpalo", // Included in Cargo's dep graph but only activated on wasm32-*-unknown.
99102
"cc",
100103
"cfg-if",
101104
"chalk-derive",
@@ -153,6 +156,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
153156
"itertools",
154157
"itoa",
155158
"jobserver",
159+
"js-sys", // Included in Cargo's dep graph but only activated on wasm32-*-unknown.
156160
"lazy_static",
157161
"libc",
158162
"libloading",
@@ -222,6 +226,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
222226
"stable_deref_trait",
223227
"stacker",
224228
"static_assertions",
229+
"subtle", // dependency of cargo (via pasetors)
225230
"syn",
226231
"synstructure",
227232
"tempfile",
@@ -264,6 +269,13 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
264269
"valuable",
265270
"version_check",
266271
"wasi",
272+
// vvv Included in Cargo's dep graph but only activated on wasm32-*-unknown.
273+
"wasm-bindgen",
274+
"wasm-bindgen-backend",
275+
"wasm-bindgen-macro",
276+
"wasm-bindgen-macro-support",
277+
"wasm-bindgen-shared",
278+
// ^^^ Included in Cargo's dep graph but only activated on wasm32-*-unknown.
267279
"winapi",
268280
"winapi-i686-pc-windows-gnu",
269281
"winapi-util",

0 commit comments

Comments
 (0)
Please sign in to comment.