aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-03-23 23:27:37 +0000
committerGitHub <[email protected]>2020-03-23 23:27:37 +0000
commitf9494f114798f66b5f2174cf518a2951a82571d3 (patch)
tree4258df4f429fcbfb23354848187b9b6be27b005f
parenteff1b3fe4d17dcecf0ec9a30c35d6c88715cb8ea (diff)
parentdf58ab8963fcd47efc5e4b83457d7cc0341cf83b (diff)
Merge #3697
3697: update itertools version to 0.9.0 r=matklad a=JoshMcguigan Updating `itertools` version per [feedback on #3689](https://github.com/rust-analyzer/rust-analyzer/pull/3689#discussion_r396267680) from @SomeoneToIgnore. Worth noting that `chalk` still uses `itertools` v0.8.2, so perhaps it is worth a PR to update that repo as well so we don't have to build both versions? Co-authored-by: Josh Mcguigan <[email protected]>
-rw-r--r--Cargo.lock23
-rw-r--r--crates/ra_assists/Cargo.toml2
-rw-r--r--crates/ra_fmt/Cargo.toml2
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_ide/Cargo.toml2
-rw-r--r--crates/ra_syntax/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
7 files changed, 22 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock
index eb5247b69..d6bd2e13e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -170,7 +170,7 @@ dependencies = [
170 "chalk-macros", 170 "chalk-macros",
171 "chalk-rust-ir", 171 "chalk-rust-ir",
172 "ena", 172 "ena",
173 "itertools", 173 "itertools 0.8.2",
174 "petgraph", 174 "petgraph",
175 "rustc-hash", 175 "rustc-hash",
176] 176]
@@ -521,6 +521,15 @@ dependencies = [
521] 521]
522 522
523[[package]] 523[[package]]
524name = "itertools"
525version = "0.9.0"
526source = "registry+https://github.com/rust-lang/crates.io-index"
527checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
528dependencies = [
529 "either",
530]
531
532[[package]]
524name = "itoa" 533name = "itoa"
525version = "0.4.5" 534version = "0.4.5"
526source = "registry+https://github.com/rust-lang/crates.io-index" 535source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -876,7 +885,7 @@ name = "ra_assists"
876version = "0.1.0" 885version = "0.1.0"
877dependencies = [ 886dependencies = [
878 "format-buf", 887 "format-buf",
879 "itertools", 888 "itertools 0.9.0",
880 "join_to_string", 889 "join_to_string",
881 "ra_db", 890 "ra_db",
882 "ra_fmt", 891 "ra_fmt",
@@ -928,7 +937,7 @@ dependencies = [
928name = "ra_fmt" 937name = "ra_fmt"
929version = "0.1.0" 938version = "0.1.0"
930dependencies = [ 939dependencies = [
931 "itertools", 940 "itertools 0.9.0",
932 "ra_syntax", 941 "ra_syntax",
933] 942]
934 943
@@ -938,7 +947,7 @@ version = "0.1.0"
938dependencies = [ 947dependencies = [
939 "arrayvec", 948 "arrayvec",
940 "either", 949 "either",
941 "itertools", 950 "itertools 0.9.0",
942 "log", 951 "log",
943 "ra_db", 952 "ra_db",
944 "ra_hir_def", 953 "ra_hir_def",
@@ -1015,7 +1024,7 @@ dependencies = [
1015 "format-buf", 1024 "format-buf",
1016 "indexmap", 1025 "indexmap",
1017 "insta", 1026 "insta",
1018 "itertools", 1027 "itertools 0.9.0",
1019 "join_to_string", 1028 "join_to_string",
1020 "log", 1029 "log",
1021 "ra_assists", 1030 "ra_assists",
@@ -1101,7 +1110,7 @@ name = "ra_syntax"
1101version = "0.1.0" 1110version = "0.1.0"
1102dependencies = [ 1111dependencies = [
1103 "arrayvec", 1112 "arrayvec",
1104 "itertools", 1113 "itertools 0.9.0",
1105 "once_cell", 1114 "once_cell",
1106 "ra_parser", 1115 "ra_parser",
1107 "ra_text_edit", 1116 "ra_text_edit",
@@ -1278,7 +1287,7 @@ dependencies = [
1278 "crossbeam-channel", 1287 "crossbeam-channel",
1279 "env_logger", 1288 "env_logger",
1280 "globset", 1289 "globset",
1281 "itertools", 1290 "itertools 0.9.0",
1282 "jod-thread", 1291 "jod-thread",
1283 "log", 1292 "log",
1284 "lsp-server", 1293 "lsp-server",
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index 85adddb5b..707746ad5 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
11format-buf = "1.0.0" 11format-buf = "1.0.0"
12join_to_string = "0.1.3" 12join_to_string = "0.1.3"
13rustc-hash = "1.1.0" 13rustc-hash = "1.1.0"
14itertools = "0.8.2" 14itertools = "0.9.0"
15 15
16ra_syntax = { path = "../ra_syntax" } 16ra_syntax = { path = "../ra_syntax" }
17ra_text_edit = { path = "../ra_text_edit" } 17ra_text_edit = { path = "../ra_text_edit" }
diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml
index ea9befeaf..e9d057afc 100644
--- a/crates/ra_fmt/Cargo.toml
+++ b/crates/ra_fmt/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
9doctest = false 9doctest = false
10 10
11[dependencies] 11[dependencies]
12itertools = "0.8.2" 12itertools = "0.9.0"
13 13
14ra_syntax = { path = "../ra_syntax" } 14ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 42193b492..ba7b39a19 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -13,7 +13,7 @@ rustc-hash = "1.1.0"
13either = "1.5.3" 13either = "1.5.3"
14arrayvec = "0.5.1" 14arrayvec = "0.5.1"
15 15
16itertools = "0.8.2" 16itertools = "0.9.0"
17 17
18ra_syntax = { path = "../ra_syntax" } 18ra_syntax = { path = "../ra_syntax" }
19ra_db = { path = "../ra_db" } 19ra_db = { path = "../ra_db" }
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 7235c944c..36eec0e60 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -14,7 +14,7 @@ wasm = []
14either = "1.5.3" 14either = "1.5.3"
15format-buf = "1.0.0" 15format-buf = "1.0.0"
16indexmap = "1.3.2" 16indexmap = "1.3.2"
17itertools = "0.8.2" 17itertools = "0.9.0"
18join_to_string = "0.1.3" 18join_to_string = "0.1.3"
19log = "0.4.8" 19log = "0.4.8"
20rustc-hash = "1.1.0" 20rustc-hash = "1.1.0"
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 8efc6b368..6fccc2303 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/rust-analyzer/rust-analyzer"
11doctest = false 11doctest = false
12 12
13[dependencies] 13[dependencies]
14itertools = "0.8.2" 14itertools = "0.9.0"
15rowan = "0.9.1" 15rowan = "0.9.1"
16rustc_lexer = "0.1.0" 16rustc_lexer = "0.1.0"
17rustc-hash = "1.1.0" 17rustc-hash = "1.1.0"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index d44f0ef1d..e071e9b8d 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -17,7 +17,7 @@ anyhow = "1.0.26"
17crossbeam-channel = "0.4.0" 17crossbeam-channel = "0.4.0"
18env_logger = { version = "0.7.1", default-features = false } 18env_logger = { version = "0.7.1", default-features = false }
19globset = "0.4.4" 19globset = "0.4.4"
20itertools = "0.8.2" 20itertools = "0.9.0"
21jod-thread = "0.1.0" 21jod-thread = "0.1.0"
22log = "0.4.8" 22log = "0.4.8"
23lsp-types = { version = "0.73.0", features = ["proposed"] } 23lsp-types = { version = "0.73.0", features = ["proposed"] }