From b8752fff19fdf5d6b821eefe1cf6709d4cad8cdf Mon Sep 17 00:00:00 2001 From: Andreas Jonson Date: Sat, 12 Sep 2020 08:24:09 +0200 Subject: [PATCH] update the version of itertools and parking_lot this is to avoid compiling multiple version of the crates in rustc --- Cargo.lock | 10 +++++----- compiler/rustc_ast_passes/Cargo.toml | 2 +- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_mir/Cargo.toml | 2 +- compiler/rustc_query_system/Cargo.toml | 2 +- src/librustdoc/Cargo.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b687e714d4f..531859d6460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3291,7 +3291,7 @@ dependencies = [ name = "rustc_ast_passes" version = "0.0.0" dependencies = [ - "itertools 0.8.2", + "itertools 0.9.0", "rustc_ast", "rustc_ast_pretty", "rustc_attr", @@ -3423,7 +3423,7 @@ dependencies = [ "jobserver", "libc", "measureme", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "rustc-hash", "rustc-rayon", "rustc-rayon-core", @@ -3752,7 +3752,7 @@ name = "rustc_mir" version = "0.0.0" dependencies = [ "either", - "itertools 0.8.2", + "itertools 0.9.0", "log_settings", "polonius-engine", "regex", @@ -3877,7 +3877,7 @@ dependencies = [ name = "rustc_query_system" version = "0.0.0" dependencies = [ - "parking_lot 0.10.2", + "parking_lot 0.11.0", "rustc-rayon-core", "rustc_arena", "rustc_data_structures", @@ -4110,7 +4110,7 @@ name = "rustdoc" version = "0.0.0" dependencies = [ "expect-test", - "itertools 0.8.2", + "itertools 0.9.0", "minifier", "pulldown-cmark", "rustc-rayon", diff --git a/compiler/rustc_ast_passes/Cargo.toml b/compiler/rustc_ast_passes/Cargo.toml index 7cf3e752c92..9ed6bdc3d6a 100644 --- a/compiler/rustc_ast_passes/Cargo.toml +++ b/compiler/rustc_ast_passes/Cargo.toml @@ -5,7 +5,7 @@ version = "0.0.0" edition = "2018" [dependencies] -itertools = "0.8" +itertools = "0.9" tracing = "0.1" rustc_ast_pretty = { path = "../rustc_ast_pretty" } rustc_attr = { path = "../rustc_attr" } diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index fcae9b936ed..3dc55cab95a 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -30,7 +30,7 @@ stacker = "0.1.11" tempfile = "3.0.5" [dependencies.parking_lot] -version = "0.10" +version = "0.11" features = ["nightly"] [target.'cfg(windows)'.dependencies] diff --git a/compiler/rustc_mir/Cargo.toml b/compiler/rustc_mir/Cargo.toml index 0a22bc7d762..a6d22243d6d 100644 --- a/compiler/rustc_mir/Cargo.toml +++ b/compiler/rustc_mir/Cargo.toml @@ -10,7 +10,7 @@ doctest = false [dependencies] either = "1.5.0" rustc_graphviz = { path = "../rustc_graphviz" } -itertools = "0.8" +itertools = "0.9" tracing = "0.1" log_settings = "0.1.1" polonius-engine = "0.12.0" diff --git a/compiler/rustc_query_system/Cargo.toml b/compiler/rustc_query_system/Cargo.toml index 7defb00a881..f38d62dec00 100644 --- a/compiler/rustc_query_system/Cargo.toml +++ b/compiler/rustc_query_system/Cargo.toml @@ -17,5 +17,5 @@ rustc_macros = { path = "../rustc_macros" } rustc_index = { path = "../rustc_index" } rustc_serialize = { path = "../rustc_serialize" } rustc_span = { path = "../rustc_span" } -parking_lot = "0.10" +parking_lot = "0.11" smallvec = { version = "1.0", features = ["union", "may_dangle"] } diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index ede52394468..90d2a18ea58 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -15,7 +15,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" smallvec = "1.0" tempfile = "3" -itertools = "0.8" +itertools = "0.9" [dev-dependencies] expect-test = "1.0"