From df496dee5869246de4562969653e0d7e7f072332 Mon Sep 17 00:00:00 2001 From: Vivek Ghaisas Date: Sat, 4 May 2019 23:46:26 +0100 Subject: [PATCH] Update Cargo.toml dependency versions to match Cargo.lock See rust-lang/rust#57443 for more context. --- src/bootstrap/Cargo.toml | 8 ++++---- src/libpanic_abort/Cargo.toml | 2 +- src/libpanic_unwind/Cargo.toml | 2 +- src/libprofiler_builtins/Cargo.toml | 2 +- src/librustc/Cargo.toml | 10 +++++----- src/librustc_asan/Cargo.toml | 2 +- src/librustc_codegen_llvm/Cargo.toml | 6 +++--- src/librustc_codegen_ssa/Cargo.toml | 12 ++++++------ src/librustc_cratesio_shim/Cargo.toml | 2 +- src/librustc_data_structures/Cargo.toml | 6 +++--- src/librustc_errors/Cargo.toml | 2 +- src/librustc_lsan/Cargo.toml | 2 +- src/librustc_metadata/Cargo.toml | 2 +- src/librustc_mir/Cargo.toml | 4 ++-- src/librustc_msan/Cargo.toml | 2 +- src/librustc_save_analysis/Cargo.toml | 2 +- src/librustc_traits/Cargo.toml | 2 +- src/librustc_tsan/Cargo.toml | 2 +- src/librustdoc/Cargo.toml | 2 +- src/libstd/Cargo.toml | 14 +++++++------- src/libsyntax/Cargo.toml | 2 +- src/libsyntax_pos/Cargo.toml | 4 ++-- src/libunwind/Cargo.toml | 4 ++-- src/tools/compiletest/Cargo.toml | 10 +++++----- src/tools/rustbook/Cargo.toml | 2 +- src/tools/rustc-workspace-hack/Cargo.toml | 16 ++++++++-------- src/tools/tidy/Cargo.toml | 8 ++++---- 27 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index 9a410c339bf5f..2f53c96afb552 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -38,13 +38,13 @@ test = false build_helper = { path = "../build_helper" } cmake = "0.1.38" filetime = "0.2" -num_cpus = "1.0" +num_cpus = "1.8" getopts = "0.2.18" cc = "1.0.35" libc = "0.2" -serde = "1.0.8" -serde_derive = "1.0.8" -serde_json = "1.0.2" +serde = "1.0.82" +serde_derive = "1.0.81" +serde_json = "1.0.33" toml = "0.4" lazy_static = "0.2" time = "0.1" diff --git a/src/libpanic_abort/Cargo.toml b/src/libpanic_abort/Cargo.toml index 2bee0b716c750..8da73f76c3cc6 100644 --- a/src/libpanic_abort/Cargo.toml +++ b/src/libpanic_abort/Cargo.toml @@ -13,4 +13,4 @@ doc = false [dependencies] core = { path = "../libcore" } libc = { version = "0.2", default-features = false } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/libpanic_unwind/Cargo.toml b/src/libpanic_unwind/Cargo.toml index 1b3901ac11a96..9fe3823ae58eb 100644 --- a/src/libpanic_unwind/Cargo.toml +++ b/src/libpanic_unwind/Cargo.toml @@ -15,4 +15,4 @@ alloc = { path = "../liballoc" } core = { path = "../libcore" } libc = { version = "0.2", default-features = false } unwind = { path = "../libunwind" } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/libprofiler_builtins/Cargo.toml b/src/libprofiler_builtins/Cargo.toml index 0d36bd0b39d76..85951e6720f4c 100644 --- a/src/libprofiler_builtins/Cargo.toml +++ b/src/libprofiler_builtins/Cargo.toml @@ -14,7 +14,7 @@ doc = false [dependencies] core = { path = "../libcore" } -compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } +compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] } [build-dependencies] cc = "1.0.1" diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml index 2468de99d60a8..e180e54a5fdc9 100644 --- a/src/librustc/Cargo.toml +++ b/src/librustc/Cargo.toml @@ -15,8 +15,8 @@ bitflags = "1.0" fmt_macros = { path = "../libfmt_macros" } graphviz = { path = "../libgraphviz" } jobserver = "0.1" -lazy_static = "1.0.0" -num_cpus = "1.0" +lazy_static = "1.2.0" +num_cpus = "1.8" scoped-tls = "1.0" log = { version = "0.4", features = ["release_max_level_info", "std"] } polonius-engine = "0.7.0" @@ -30,10 +30,10 @@ errors = { path = "../librustc_errors", package = "rustc_errors" } serialize = { path = "../libserialize" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -backtrace = "0.3.3" +backtrace = "0.3.11" parking_lot = "0.7" -byteorder = { version = "1.1", features = ["i128"]} -chalk-engine = { version = "0.9.0", default-features=false } +byteorder = { version = "1.2", features = ["i128"] } +chalk-engine = { version = "0.9.0", default-features = false } rustc_fs_util = { path = "../librustc_fs_util" } smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } measureme = "0.2.1" diff --git a/src/librustc_asan/Cargo.toml b/src/librustc_asan/Cargo.toml index df117de8720e0..6e6e9629f9d7e 100644 --- a/src/librustc_asan/Cargo.toml +++ b/src/librustc_asan/Cargo.toml @@ -17,4 +17,4 @@ cmake = "0.1.38" [dependencies] alloc = { path = "../liballoc" } core = { path = "../libcore" } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 841cf98164eb4..d2307acc2839e 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -11,9 +11,9 @@ crate-type = ["dylib"] test = false [dependencies] -cc = "1.0.1" # Used to locate MSVC -num_cpus = "1.0" -rustc-demangle = "0.1.4" +cc = "1.0.35" +num_cpus = "1.8" +rustc-demangle = "0.1.10" rustc_llvm = { path = "../librustc_llvm" } memmap = "0.6" diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml index af99d39182c24..517134a99a1e1 100644 --- a/src/librustc_codegen_ssa/Cargo.toml +++ b/src/librustc_codegen_ssa/Cargo.toml @@ -12,13 +12,13 @@ test = false [dependencies] bitflags = "1.0.4" -cc = "1.0.1" -num_cpus = "1.0" -rustc-demangle = "0.1.4" +cc = "1.0.35" +num_cpus = "1.8" +rustc-demangle = "0.1.10" memmap = "0.6" -log = "0.4.5" -libc = "0.2.44" -jobserver = "0.1.11" +log = "0.4.6" +libc = "0.2.54" +jobserver = "0.1.13" parking_lot = "0.7" tempfile = "3.0.5" diff --git a/src/librustc_cratesio_shim/Cargo.toml b/src/librustc_cratesio_shim/Cargo.toml index 6bdfbe09354b4..799758d569fac 100644 --- a/src/librustc_cratesio_shim/Cargo.toml +++ b/src/librustc_cratesio_shim/Cargo.toml @@ -23,4 +23,4 @@ crate-type = ["dylib"] [dependencies] bitflags = "1.0" log = "0.4" -unicode-width = "0.1.4" +unicode-width = "0.1.5" diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml index 5f3bac866d6a7..5f8412a0cc04e 100644 --- a/src/librustc_data_structures/Cargo.toml +++ b/src/librustc_data_structures/Cargo.toml @@ -13,12 +13,12 @@ crate-type = ["dylib"] ena = "0.13" log = "0.4" jobserver_crate = { version = "0.1.13", package = "jobserver" } -lazy_static = "1" +lazy_static = "1.2.0" rustc_cratesio_shim = { path = "../librustc_cratesio_shim" } serialize = { path = "../libserialize" } graphviz = { path = "../libgraphviz" } -cfg-if = "0.1.2" -stable_deref_trait = "1.0.0" +cfg-if = "0.1.6" +stable_deref_trait = "1.1.0" rayon = { version = "0.2.0", package = "rustc-rayon" } rayon-core = { version = "0.2.0", package = "rustc-rayon-core" } rustc-hash = "1.0.1" diff --git a/src/librustc_errors/Cargo.toml b/src/librustc_errors/Cargo.toml index 02c011857bd2a..5f72b51e89f5c 100644 --- a/src/librustc_errors/Cargo.toml +++ b/src/librustc_errors/Cargo.toml @@ -15,6 +15,6 @@ serialize = { path = "../libserialize" } syntax_pos = { path = "../libsyntax_pos" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_cratesio_shim = { path = "../librustc_cratesio_shim" } -unicode-width = "0.1.4" +unicode-width = "0.1.5" atty = "0.2" termcolor = "1.0" diff --git a/src/librustc_lsan/Cargo.toml b/src/librustc_lsan/Cargo.toml index 9a24361f44e64..5079bd71265b4 100644 --- a/src/librustc_lsan/Cargo.toml +++ b/src/librustc_lsan/Cargo.toml @@ -17,4 +17,4 @@ cmake = "0.1.38" [dependencies] alloc = { path = "../liballoc" } core = { path = "../libcore" } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml index e234f4f880703..1fb11c0c5781a 100644 --- a/src/librustc_metadata/Cargo.toml +++ b/src/librustc_metadata/Cargo.toml @@ -18,7 +18,7 @@ rustc_data_structures = { path = "../librustc_data_structures" } errors = { path = "../librustc_errors", package = "rustc_errors" } rustc_target = { path = "../librustc_target" } serialize = { path = "../libserialize" } -stable_deref_trait = "1.0.0" +stable_deref_trait = "1.1.0" syntax = { path = "../libsyntax" } syntax_ext = { path = "../libsyntax_ext" } syntax_pos = { path = "../libsyntax_pos" } diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml index 5de5f5e757119..46b2bfda268c6 100644 --- a/src/librustc_mir/Cargo.toml +++ b/src/librustc_mir/Cargo.toml @@ -14,7 +14,7 @@ arena = { path = "../libarena" } either = "1.5.0" dot = { path = "../libgraphviz", package = "graphviz" } log = "0.4" -log_settings = "0.1.1" +log_settings = "0.1.2" polonius-engine = "0.7.0" rustc = { path = "../librustc" } rustc_target = { path = "../librustc_target" } @@ -23,6 +23,6 @@ rustc_errors = { path = "../librustc_errors" } serialize = { path = "../libserialize" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -byteorder = { version = "1.1", features = ["i128"] } +byteorder = { version = "1.2", features = ["i128"] } rustc_apfloat = { path = "../librustc_apfloat" } smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } diff --git a/src/librustc_msan/Cargo.toml b/src/librustc_msan/Cargo.toml index bda4078572501..732a12bee6c82 100644 --- a/src/librustc_msan/Cargo.toml +++ b/src/librustc_msan/Cargo.toml @@ -17,4 +17,4 @@ cmake = "0.1.38" [dependencies] alloc = { path = "../liballoc" } core = { path = "../libcore" } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml index 767c726b761f2..6d8816294d913 100644 --- a/src/librustc_save_analysis/Cargo.toml +++ b/src/librustc_save_analysis/Cargo.toml @@ -16,7 +16,7 @@ rustc_data_structures = { path = "../librustc_data_structures" } rustc_codegen_utils = { path = "../librustc_codegen_utils" } rustc_target = { path = "../librustc_target" } rustc_typeck = { path = "../librustc_typeck" } -serde_json = "1" +serde_json = "1.0.33" syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } rls-data = "0.19" diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml index da19cc95eb95a..4d60a08a1e8c8 100644 --- a/src/librustc_traits/Cargo.toml +++ b/src/librustc_traits/Cargo.toml @@ -18,5 +18,5 @@ rustc_data_structures = { path = "../librustc_data_structures" } rustc_target = { path = "../librustc_target" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -chalk-engine = { version = "0.9.0", default-features=false } +chalk-engine = { version = "0.9.0", default-features = false } smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } diff --git a/src/librustc_tsan/Cargo.toml b/src/librustc_tsan/Cargo.toml index 82045dd0cddc7..818612d1ea57b 100644 --- a/src/librustc_tsan/Cargo.toml +++ b/src/librustc_tsan/Cargo.toml @@ -17,4 +17,4 @@ cmake = "0.1.38" [dependencies] alloc = { path = "../liballoc" } core = { path = "../libcore" } -compiler_builtins = "0.1.0" +compiler_builtins = "0.1.10" diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 6cedab412df92..60759f83671f5 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -11,5 +11,5 @@ path = "lib.rs" [dependencies] pulldown-cmark = { version = "0.4.1", default-features = false } minifier = "0.0.30" -tempfile = "3" +tempfile = "3.0.5" parking_lot = "0.7" diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index ac1aff845d8c9..941e262d5a292 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -8,6 +8,10 @@ repository = "https://github.com/rust-lang/rust.git" description = "The Rust Standard Library" edition = "2018" +[package.metadata.fortanix-sgx] +# Maximum possible number of threads when testing +threads = 125 + [lib] name = "std" path = "lib.rs" @@ -18,13 +22,13 @@ alloc = { path = "../liballoc" } panic_unwind = { path = "../libpanic_unwind", optional = true } panic_abort = { path = "../libpanic_abort" } core = { path = "../libcore" } -libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] } -compiler_builtins = { version = "0.1.9" } +libc = { version = "0.2.54", default-features = false, features = ['rustc-dep-of-std'] } +compiler_builtins = { version = "0.1.10" } profiler_builtins = { path = "../libprofiler_builtins", optional = true } unwind = { path = "../libunwind" } hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] } rustc-demangle = { version = "0.1.10", features = ['rustc-dep-of-std'] } -backtrace-sys = { version = "0.1.24", features = ["rustc-dep-of-std"], optional = true } +backtrace-sys = { version = "0.1.27", features = ["rustc-dep-of-std"], optional = true } [dev-dependencies] rand = "0.6.1" @@ -74,7 +78,3 @@ wasm-bindgen-threads = [] # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml std_detect_file_io = [] std_detect_dlsym_getauxval = [] - -[package.metadata.fortanix-sgx] -# Maximum possible number of threads when testing -threads = 125 diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml index b48f3c9b8b8d8..fc7fadcda17f1 100644 --- a/src/libsyntax/Cargo.toml +++ b/src/libsyntax/Cargo.toml @@ -14,7 +14,7 @@ bitflags = "1.0" serialize = { path = "../libserialize" } log = "0.4" scoped-tls = "1.0" -lazy_static = "1.0.0" +lazy_static = "1.2.0" syntax_pos = { path = "../libsyntax_pos" } errors = { path = "../librustc_errors", package = "rustc_errors" } rustc_data_structures = { path = "../librustc_data_structures" } diff --git a/src/libsyntax_pos/Cargo.toml b/src/libsyntax_pos/Cargo.toml index af7edc0a6bd3e..4651f751dd147 100644 --- a/src/libsyntax_pos/Cargo.toml +++ b/src/libsyntax_pos/Cargo.toml @@ -15,5 +15,5 @@ rustc_macros = { path = "../librustc_macros" } rustc_data_structures = { path = "../librustc_data_structures" } arena = { path = "../libarena" } scoped-tls = "1.0" -unicode-width = "0.1.4" -cfg-if = "0.1.2" +unicode-width = "0.1.5" +cfg-if = "0.1.6" diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml index 4ddc878997ee5..5cf8c111dd8f4 100644 --- a/src/libunwind/Cargo.toml +++ b/src/libunwind/Cargo.toml @@ -17,8 +17,8 @@ doc = false [dependencies] core = { path = "../libcore" } -libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } -compiler_builtins = "0.1.0" +libc = { version = "0.2.54", features = ['rustc-dep-of-std'], default-features = false } +compiler_builtins = "0.1.10" [build-dependencies] cc = { optional = true, version = "1.0.1" } diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 00e1a53473cda..0fa383edbac81 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -5,18 +5,18 @@ version = "0.0.0" edition = "2018" [dependencies] -diff = "0.1.10" +diff = "0.1.11" env_logger = { version = "0.5", default-features = false } filetime = "0.2" getopts = "0.2" log = "0.4" -regex = "1.0" +regex = "1.1" serde = "1.0" serde_json = "1.0" serde_derive = "1.0" -rustfix = "0.4.1" -lazy_static = "1.0" -walkdir = "2" +rustfix = "0.4.4" +lazy_static = "1.2" +walkdir = "2.2.7" [target.'cfg(unix)'.dependencies] libc = "0.2" diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index 5bf1553b22711..841e6384e8048 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT/Apache-2.0" edition = "2018" [dependencies] -clap = "2.25.0" +clap = "2.32.0" [dependencies.mdbook_2] package = "mdbook" diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index d51841cd65075..aca6e24c5e0b4 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -54,19 +54,19 @@ features = [ "wincrypt", ] + +[target.'cfg(not(windows))'.dependencies] +openssl = { version = "0.10.12", optional = true } + [dependencies] -curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } +curl-sys = { version = "0.4.18", features = ["http2", "libnghttp2-sys"], optional = true } parking_lot = { version = "0.7", features = ['nightly'] } rand = { version = "0.6.1", features = ["i128_support"] } serde = { version = "1.0.82", features = ['derive'] } -serde_json = { version = "1.0.31", features = ["raw_value"] } +serde_json = { version = "1.0.33", features = ["raw_value"] } smallvec = { version = "0.6", features = ['union', 'may_dangle'] } -scopeguard = { version = "0.3.3", features = ["use_std", "default"]} -byteorder = { version = "1.2.7", features = ["i128"]} - - -[target.'cfg(not(windows))'.dependencies] -openssl = { version = "0.10.12", optional = true } +scopeguard = { version = "0.3.3", features = ["use_std", "default"] } +byteorder = { version = "1.2.7", features = ["i128"] } [features] diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 433e9264dd1dc..0f87f7c0a82bc 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Alex Crichton "] edition = "2018" [dependencies] -regex = "1" -serde = "1.0.8" -serde_derive = "1.0.8" -serde_json = "1.0.2" +regex = "1.1.0" +serde = "1.0.82" +serde_derive = "1.0.81" +serde_json = "1.0.33"