Skip to content

Commit df496de

Browse files
committed
Update Cargo.toml dependency versions to match Cargo.lock
See rust-lang#57443 for more context.
1 parent 8dd4aae commit df496de

File tree

27 files changed

+66
-66
lines changed

27 files changed

+66
-66
lines changed

src/bootstrap/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ test = false
3838
build_helper = { path = "../build_helper" }
3939
cmake = "0.1.38"
4040
filetime = "0.2"
41-
num_cpus = "1.0"
41+
num_cpus = "1.8"
4242
getopts = "0.2.18"
4343
cc = "1.0.35"
4444
libc = "0.2"
45-
serde = "1.0.8"
46-
serde_derive = "1.0.8"
47-
serde_json = "1.0.2"
45+
serde = "1.0.82"
46+
serde_derive = "1.0.81"
47+
serde_json = "1.0.33"
4848
toml = "0.4"
4949
lazy_static = "0.2"
5050
time = "0.1"

src/libpanic_abort/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ doc = false
1313
[dependencies]
1414
core = { path = "../libcore" }
1515
libc = { version = "0.2", default-features = false }
16-
compiler_builtins = "0.1.0"
16+
compiler_builtins = "0.1.10"

src/libpanic_unwind/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ alloc = { path = "../liballoc" }
1515
core = { path = "../libcore" }
1616
libc = { version = "0.2", default-features = false }
1717
unwind = { path = "../libunwind" }
18-
compiler_builtins = "0.1.0"
18+
compiler_builtins = "0.1.10"

src/libprofiler_builtins/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doc = false
1414

1515
[dependencies]
1616
core = { path = "../libcore" }
17-
compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
17+
compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] }
1818

1919
[build-dependencies]
2020
cc = "1.0.1"

src/librustc/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ bitflags = "1.0"
1515
fmt_macros = { path = "../libfmt_macros" }
1616
graphviz = { path = "../libgraphviz" }
1717
jobserver = "0.1"
18-
lazy_static = "1.0.0"
19-
num_cpus = "1.0"
18+
lazy_static = "1.2.0"
19+
num_cpus = "1.8"
2020
scoped-tls = "1.0"
2121
log = { version = "0.4", features = ["release_max_level_info", "std"] }
2222
polonius-engine = "0.7.0"
@@ -30,10 +30,10 @@ errors = { path = "../librustc_errors", package = "rustc_errors" }
3030
serialize = { path = "../libserialize" }
3131
syntax = { path = "../libsyntax" }
3232
syntax_pos = { path = "../libsyntax_pos" }
33-
backtrace = "0.3.3"
33+
backtrace = "0.3.11"
3434
parking_lot = "0.7"
35-
byteorder = { version = "1.1", features = ["i128"]}
36-
chalk-engine = { version = "0.9.0", default-features=false }
35+
byteorder = { version = "1.2", features = ["i128"] }
36+
chalk-engine = { version = "0.9.0", default-features = false }
3737
rustc_fs_util = { path = "../librustc_fs_util" }
3838
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
3939
measureme = "0.2.1"

src/librustc_asan/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ cmake = "0.1.38"
1717
[dependencies]
1818
alloc = { path = "../liballoc" }
1919
core = { path = "../libcore" }
20-
compiler_builtins = "0.1.0"
20+
compiler_builtins = "0.1.10"

src/librustc_codegen_llvm/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ crate-type = ["dylib"]
1111
test = false
1212

1313
[dependencies]
14-
cc = "1.0.1" # Used to locate MSVC
15-
num_cpus = "1.0"
16-
rustc-demangle = "0.1.4"
14+
cc = "1.0.35"
15+
num_cpus = "1.8"
16+
rustc-demangle = "0.1.10"
1717
rustc_llvm = { path = "../librustc_llvm" }
1818
memmap = "0.6"
1919

src/librustc_codegen_ssa/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ test = false
1212

1313
[dependencies]
1414
bitflags = "1.0.4"
15-
cc = "1.0.1"
16-
num_cpus = "1.0"
17-
rustc-demangle = "0.1.4"
15+
cc = "1.0.35"
16+
num_cpus = "1.8"
17+
rustc-demangle = "0.1.10"
1818
memmap = "0.6"
19-
log = "0.4.5"
20-
libc = "0.2.44"
21-
jobserver = "0.1.11"
19+
log = "0.4.6"
20+
libc = "0.2.54"
21+
jobserver = "0.1.13"
2222
parking_lot = "0.7"
2323
tempfile = "3.0.5"
2424

src/librustc_cratesio_shim/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ crate-type = ["dylib"]
2323
[dependencies]
2424
bitflags = "1.0"
2525
log = "0.4"
26-
unicode-width = "0.1.4"
26+
unicode-width = "0.1.5"

src/librustc_data_structures/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ crate-type = ["dylib"]
1313
ena = "0.13"
1414
log = "0.4"
1515
jobserver_crate = { version = "0.1.13", package = "jobserver" }
16-
lazy_static = "1"
16+
lazy_static = "1.2.0"
1717
rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
1818
serialize = { path = "../libserialize" }
1919
graphviz = { path = "../libgraphviz" }
20-
cfg-if = "0.1.2"
21-
stable_deref_trait = "1.0.0"
20+
cfg-if = "0.1.6"
21+
stable_deref_trait = "1.1.0"
2222
rayon = { version = "0.2.0", package = "rustc-rayon" }
2323
rayon-core = { version = "0.2.0", package = "rustc-rayon-core" }
2424
rustc-hash = "1.0.1"

src/librustc_errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ serialize = { path = "../libserialize" }
1515
syntax_pos = { path = "../libsyntax_pos" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
18-
unicode-width = "0.1.4"
18+
unicode-width = "0.1.5"
1919
atty = "0.2"
2020
termcolor = "1.0"

src/librustc_lsan/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ cmake = "0.1.38"
1717
[dependencies]
1818
alloc = { path = "../liballoc" }
1919
core = { path = "../libcore" }
20-
compiler_builtins = "0.1.0"
20+
compiler_builtins = "0.1.10"

src/librustc_metadata/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1818
errors = { path = "../librustc_errors", package = "rustc_errors" }
1919
rustc_target = { path = "../librustc_target" }
2020
serialize = { path = "../libserialize" }
21-
stable_deref_trait = "1.0.0"
21+
stable_deref_trait = "1.1.0"
2222
syntax = { path = "../libsyntax" }
2323
syntax_ext = { path = "../libsyntax_ext" }
2424
syntax_pos = { path = "../libsyntax_pos" }

src/librustc_mir/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ arena = { path = "../libarena" }
1414
either = "1.5.0"
1515
dot = { path = "../libgraphviz", package = "graphviz" }
1616
log = "0.4"
17-
log_settings = "0.1.1"
17+
log_settings = "0.1.2"
1818
polonius-engine = "0.7.0"
1919
rustc = { path = "../librustc" }
2020
rustc_target = { path = "../librustc_target" }
@@ -23,6 +23,6 @@ rustc_errors = { path = "../librustc_errors" }
2323
serialize = { path = "../libserialize" }
2424
syntax = { path = "../libsyntax" }
2525
syntax_pos = { path = "../libsyntax_pos" }
26-
byteorder = { version = "1.1", features = ["i128"] }
26+
byteorder = { version = "1.2", features = ["i128"] }
2727
rustc_apfloat = { path = "../librustc_apfloat" }
2828
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }

src/librustc_msan/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ cmake = "0.1.38"
1717
[dependencies]
1818
alloc = { path = "../liballoc" }
1919
core = { path = "../libcore" }
20-
compiler_builtins = "0.1.0"
20+
compiler_builtins = "0.1.10"

src/librustc_save_analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1616
rustc_codegen_utils = { path = "../librustc_codegen_utils" }
1717
rustc_target = { path = "../librustc_target" }
1818
rustc_typeck = { path = "../librustc_typeck" }
19-
serde_json = "1"
19+
serde_json = "1.0.33"
2020
syntax = { path = "../libsyntax" }
2121
syntax_pos = { path = "../libsyntax_pos" }
2222
rls-data = "0.19"

src/librustc_traits/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_target = { path = "../librustc_target" }
1919
syntax = { path = "../libsyntax" }
2020
syntax_pos = { path = "../libsyntax_pos" }
21-
chalk-engine = { version = "0.9.0", default-features=false }
21+
chalk-engine = { version = "0.9.0", default-features = false }
2222
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }

src/librustc_tsan/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ cmake = "0.1.38"
1717
[dependencies]
1818
alloc = { path = "../liballoc" }
1919
core = { path = "../libcore" }
20-
compiler_builtins = "0.1.0"
20+
compiler_builtins = "0.1.10"

src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ path = "lib.rs"
1111
[dependencies]
1212
pulldown-cmark = { version = "0.4.1", default-features = false }
1313
minifier = "0.0.30"
14-
tempfile = "3"
14+
tempfile = "3.0.5"
1515
parking_lot = "0.7"

src/libstd/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ repository = "https://github.com/rust-lang/rust.git"
88
description = "The Rust Standard Library"
99
edition = "2018"
1010

11+
[package.metadata.fortanix-sgx]
12+
# Maximum possible number of threads when testing
13+
threads = 125
14+
1115
[lib]
1216
name = "std"
1317
path = "lib.rs"
@@ -18,13 +22,13 @@ alloc = { path = "../liballoc" }
1822
panic_unwind = { path = "../libpanic_unwind", optional = true }
1923
panic_abort = { path = "../libpanic_abort" }
2024
core = { path = "../libcore" }
21-
libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] }
22-
compiler_builtins = { version = "0.1.9" }
25+
libc = { version = "0.2.54", default-features = false, features = ['rustc-dep-of-std'] }
26+
compiler_builtins = { version = "0.1.10" }
2327
profiler_builtins = { path = "../libprofiler_builtins", optional = true }
2428
unwind = { path = "../libunwind" }
2529
hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] }
2630
rustc-demangle = { version = "0.1.10", features = ['rustc-dep-of-std'] }
27-
backtrace-sys = { version = "0.1.24", features = ["rustc-dep-of-std"], optional = true }
31+
backtrace-sys = { version = "0.1.27", features = ["rustc-dep-of-std"], optional = true }
2832

2933
[dev-dependencies]
3034
rand = "0.6.1"
@@ -74,7 +78,3 @@ wasm-bindgen-threads = []
7478
# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml
7579
std_detect_file_io = []
7680
std_detect_dlsym_getauxval = []
77-
78-
[package.metadata.fortanix-sgx]
79-
# Maximum possible number of threads when testing
80-
threads = 125

src/libsyntax/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bitflags = "1.0"
1414
serialize = { path = "../libserialize" }
1515
log = "0.4"
1616
scoped-tls = "1.0"
17-
lazy_static = "1.0.0"
17+
lazy_static = "1.2.0"
1818
syntax_pos = { path = "../libsyntax_pos" }
1919
errors = { path = "../librustc_errors", package = "rustc_errors" }
2020
rustc_data_structures = { path = "../librustc_data_structures" }

src/libsyntax_pos/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ rustc_macros = { path = "../librustc_macros" }
1515
rustc_data_structures = { path = "../librustc_data_structures" }
1616
arena = { path = "../libarena" }
1717
scoped-tls = "1.0"
18-
unicode-width = "0.1.4"
19-
cfg-if = "0.1.2"
18+
unicode-width = "0.1.5"
19+
cfg-if = "0.1.6"

src/libunwind/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ doc = false
1717

1818
[dependencies]
1919
core = { path = "../libcore" }
20-
libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false }
21-
compiler_builtins = "0.1.0"
20+
libc = { version = "0.2.54", features = ['rustc-dep-of-std'], default-features = false }
21+
compiler_builtins = "0.1.10"
2222

2323
[build-dependencies]
2424
cc = { optional = true, version = "1.0.1" }

src/tools/compiletest/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ version = "0.0.0"
55
edition = "2018"
66

77
[dependencies]
8-
diff = "0.1.10"
8+
diff = "0.1.11"
99
env_logger = { version = "0.5", default-features = false }
1010
filetime = "0.2"
1111
getopts = "0.2"
1212
log = "0.4"
13-
regex = "1.0"
13+
regex = "1.1"
1414
serde = "1.0"
1515
serde_json = "1.0"
1616
serde_derive = "1.0"
17-
rustfix = "0.4.1"
18-
lazy_static = "1.0"
19-
walkdir = "2"
17+
rustfix = "0.4.4"
18+
lazy_static = "1.2"
19+
walkdir = "2.2.7"
2020

2121
[target.'cfg(unix)'.dependencies]
2222
libc = "0.2"

src/tools/rustbook/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MIT/Apache-2.0"
66
edition = "2018"
77

88
[dependencies]
9-
clap = "2.25.0"
9+
clap = "2.32.0"
1010

1111
[dependencies.mdbook_2]
1212
package = "mdbook"

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ features = [
5454
"wincrypt",
5555
]
5656

57+
58+
[target.'cfg(not(windows))'.dependencies]
59+
openssl = { version = "0.10.12", optional = true }
60+
5761
[dependencies]
58-
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
62+
curl-sys = { version = "0.4.18", features = ["http2", "libnghttp2-sys"], optional = true }
5963
parking_lot = { version = "0.7", features = ['nightly'] }
6064
rand = { version = "0.6.1", features = ["i128_support"] }
6165
serde = { version = "1.0.82", features = ['derive'] }
62-
serde_json = { version = "1.0.31", features = ["raw_value"] }
66+
serde_json = { version = "1.0.33", features = ["raw_value"] }
6367
smallvec = { version = "0.6", features = ['union', 'may_dangle'] }
64-
scopeguard = { version = "0.3.3", features = ["use_std", "default"]}
65-
byteorder = { version = "1.2.7", features = ["i128"]}
66-
67-
68-
[target.'cfg(not(windows))'.dependencies]
69-
openssl = { version = "0.10.12", optional = true }
68+
scopeguard = { version = "0.3.3", features = ["use_std", "default"] }
69+
byteorder = { version = "1.2.7", features = ["i128"] }
7070

7171

7272
[features]

src/tools/tidy/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Alex Crichton <[email protected]>"]
55
edition = "2018"
66

77
[dependencies]
8-
regex = "1"
9-
serde = "1.0.8"
10-
serde_derive = "1.0.8"
11-
serde_json = "1.0.2"
8+
regex = "1.1.0"
9+
serde = "1.0.82"
10+
serde_derive = "1.0.81"
11+
serde_json = "1.0.33"

0 commit comments

Comments
 (0)