diff options
| author | bors <bors@rust-lang.org> | 2021-04-28 02:45:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-28 02:45:03 +0000 |
| commit | 537544b1061467ee4b74ef7f552fab3d513e5caf (patch) | |
| tree | afeaca6af3f962c7398f27cf06b430070ad47790 /src | |
| parent | 27bd3f51a90733aabee45a9019a3aa785eccfd05 (diff) | |
| parent | 7d3186d92a485f549b7ada938cb3cf3bf5f7f769 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 5776d56d187..d39cb597b21 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -63,12 +63,13 @@ features = [ [dependencies] byteorder = { version = "1", features = ['default', 'std'] } curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } -crossbeam-utils = { version = "0.7.2", features = ["nightly"] } +crossbeam-utils = { version = "0.8.0", features = ["nightly"] } libc = { version = "0.2.79", features = ["align"] } # Ensure default features of libz-sys, which are disabled in some scenarios. libz-sys = { version = "1.1.2" } proc-macro2 = { version = "1", features = ["default"] } quote = { version = "1", features = ["default"] } +rand_core_0_5 = { package = "rand_core", version = "0.5.1", features = ["getrandom", "alloc", "std"] } serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value", "unbounded_depth"] } smallvec = { version = "1.6.1", features = ['union', 'may_dangle'] } diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 51f48d8f2ec..5a843ea61ec 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -35,11 +35,9 @@ const EXCEPTIONS: &[(&str, &str)] = &[ ("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde) ("bytesize", "Apache-2.0"), // cargo ("im-rc", "MPL-2.0+"), // cargo - ("constant_time_eq", "CC0-1.0"), // rustfmt ("sized-chunks", "MPL-2.0+"), // cargo via im-rc ("bitmaps", "MPL-2.0+"), // cargo via im-rc ("crossbeam-queue", "MIT/Apache-2.0 AND BSD-2-Clause"), // rls via rayon - ("arrayref", "BSD-2-Clause"), // cargo-miri/directories/.../rust-argon2 (redox) ("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot ("snap", "BSD-3-Clause"), // rustc // FIXME: this dependency violates the documentation comment above: |