From f5e702df0efa48018bf27fdfa791357e0d6fac78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 26 Mar 2020 14:10:35 +0100 Subject: [PATCH] Upgrade rustc and bootstrap dependencies --- Cargo.lock | 55 ++++++++++++++++++------- src/bootstrap/Cargo.toml | 2 +- src/librustc/Cargo.toml | 2 +- src/librustc_data_structures/Cargo.toml | 4 +- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8bf6198913530..b9a49efab89d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,6 +119,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + [[package]] name = "backtrace" version = "0.3.46" @@ -292,7 +298,7 @@ dependencies = [ "clap", "core-foundation 0.7.0", "crates-io", - "crossbeam-utils 0.7.0", + "crossbeam-utils 0.7.2", "crypto-hash", "curl", "curl-sys", @@ -706,7 +712,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" dependencies = [ - "crossbeam-utils 0.7.0", + "crossbeam-utils 0.7.2", ] [[package]] @@ -754,11 +760,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg", + "autocfg 1.0.0", "cfg-if", "lazy_static 1.4.0", ] @@ -775,6 +781,16 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "ctor" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c5e5ac752e18207b12e16b10631ae5f7f68f8805f335f9b817ead83d9ffce1" +dependencies = [ + "quote 1.0.2", + "syn 1.0.11", +] + [[package]] name = "curl" version = "0.4.25" @@ -1340,7 +1356,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd9867f119b19fecb08cd5c326ad4488d7a1da4bf75b4d95d71db742525aaab" dependencies = [ - "autocfg", + "autocfg 0.1.7", "compiler_builtins", "rustc-std-workspace-alloc", "rustc-std-workspace-core", @@ -2281,11 +2297,11 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.53" +version = "0.9.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" +checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" dependencies = [ - "autocfg", + "autocfg 1.0.0", "cc", "libc", "openssl-src", @@ -2299,6 +2315,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024" +[[package]] +name = "output_vt100" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" +dependencies = [ + "winapi 0.3.8", +] + [[package]] name = "packed_simd" version = "0.3.1" @@ -2521,12 +2546,14 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "pretty_assertions" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6" +checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" dependencies = [ "ansi_term", + "ctor", "difference", + "output_vt100", ] [[package]] @@ -3117,7 +3144,7 @@ dependencies = [ "jobserver", "log", "measureme", - "parking_lot 0.9.0", + "parking_lot 0.10.0", "polonius-engine", "rustc-rayon", "rustc-rayon-core", @@ -3633,7 +3660,7 @@ version = "0.0.0" dependencies = [ "bitflags", "cfg-if", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.2", "ena", "graphviz", "indexmap", @@ -3641,7 +3668,7 @@ dependencies = [ "lazy_static 1.4.0", "log", "measureme", - "parking_lot 0.9.0", + "parking_lot 0.10.0", "rustc-hash", "rustc-rayon", "rustc-rayon-core", diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index c09f58cc591a6..f7856f6a7fcb1 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -54,4 +54,4 @@ version = "0.3" features = ["fileapi", "ioapiset", "jobapi2", "handleapi", "winioctl"] [dev-dependencies] -pretty_assertions = "0.5" +pretty_assertions = "0.6" diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml index 47b94a2f1a4b4..1dd742c35496b 100644 --- a/src/librustc/Cargo.toml +++ b/src/librustc/Cargo.toml @@ -32,7 +32,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_ast = { path = "../librustc_ast" } rustc_span = { path = "../librustc_span" } backtrace = "0.3.40" -parking_lot = "0.9" +parking_lot = "0.10" byteorder = { version = "1.3" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } measureme = "0.7.1" diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml index fb4f818c4b249..c5707bd24f7e7 100644 --- a/src/librustc_data_structures/Cargo.toml +++ b/src/librustc_data_structures/Cargo.toml @@ -18,7 +18,7 @@ lazy_static = "1" rustc_serialize = { path = "../libserialize", package = "serialize" } graphviz = { path = "../libgraphviz" } cfg-if = "0.1.2" -crossbeam-utils = { version = "0.6.5", features = ["nightly"] } +crossbeam-utils = { version = "0.7", features = ["nightly"] } stable_deref_trait = "1.0.0" rayon = { version = "0.3.0", package = "rustc-rayon" } rayon-core = { version = "0.3.0", package = "rustc-rayon-core" } @@ -29,7 +29,7 @@ bitflags = "1.2.1" measureme = "0.7.1" [dependencies.parking_lot] -version = "0.9" +version = "0.10" features = ["nightly"] [target.'cfg(windows)'.dependencies]