diff options
author | Kirill Bulatov <[email protected]> | 2020-01-15 18:20:20 +0000 |
---|---|---|
committer | Kirill Bulatov <[email protected]> | 2020-01-15 18:20:20 +0000 |
commit | d51cf7794d110b064fd0e8d53726b4608ec50d1a (patch) | |
tree | 4cc529cede52694d63626dc1746b0f0971eaadb3 | |
parent | 78a21253b494e573885ac8336bff6e93b401046f (diff) |
itertools::Either -> either::Either
-rw-r--r-- | Cargo.lock | 4 | ||||
-rw-r--r-- | crates/ra_assists/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_assists/src/assist_ctx.rs | 2 | ||||
-rw-r--r-- | crates/ra_assists/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/assists.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2e7698b59..45c4de2b6 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -869,8 +869,8 @@ version = "0.1.0" | |||
869 | name = "ra_assists" | 869 | name = "ra_assists" |
870 | version = "0.1.0" | 870 | version = "0.1.0" |
871 | dependencies = [ | 871 | dependencies = [ |
872 | "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
872 | "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 873 | "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
873 | "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
874 | "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 874 | "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", |
875 | "ra_db 0.1.0", | 875 | "ra_db 0.1.0", |
876 | "ra_fmt 0.1.0", | 876 | "ra_fmt 0.1.0", |
@@ -1066,8 +1066,8 @@ name = "ra_lsp_server" | |||
1066 | version = "0.1.0" | 1066 | version = "0.1.0" |
1067 | dependencies = [ | 1067 | dependencies = [ |
1068 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1068 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1069 | "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1069 | "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1070 | "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1070 | "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1071 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1071 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1072 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1072 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1073 | "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1073 | "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml index 50be8d9bc..0d2109e4e 100644 --- a/crates/ra_assists/Cargo.toml +++ b/crates/ra_assists/Cargo.toml | |||
@@ -11,7 +11,7 @@ doctest = false | |||
11 | format-buf = "1.0.0" | 11 | format-buf = "1.0.0" |
12 | join_to_string = "0.1.3" | 12 | join_to_string = "0.1.3" |
13 | rustc-hash = "1.0" | 13 | rustc-hash = "1.0" |
14 | itertools = "0.8.0" | 14 | either = "1.5" |
15 | 15 | ||
16 | ra_syntax = { path = "../ra_syntax" } | 16 | ra_syntax = { path = "../ra_syntax" } |
17 | ra_text_edit = { path = "../ra_text_edit" } | 17 | ra_text_edit = { path = "../ra_text_edit" } |
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs index e13f969c7..621b9feb2 100644 --- a/crates/ra_assists/src/assist_ctx.rs +++ b/crates/ra_assists/src/assist_ctx.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! This module defines `AssistCtx` -- the API surface that is exposed to assists. | 1 | //! This module defines `AssistCtx` -- the API surface that is exposed to assists. |
2 | use either::Either; | ||
2 | use hir::{db::HirDatabase, InFile, SourceAnalyzer}; | 3 | use hir::{db::HirDatabase, InFile, SourceAnalyzer}; |
3 | use itertools::Either; | ||
4 | use ra_db::FileRange; | 4 | use ra_db::FileRange; |
5 | use ra_fmt::{leading_indent, reindent}; | 5 | use ra_fmt::{leading_indent, reindent}; |
6 | use ra_syntax::{ | 6 | use ra_syntax::{ |
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index a2983ae87..d45b58966 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs | |||
@@ -13,8 +13,8 @@ mod doc_tests; | |||
13 | mod test_db; | 13 | mod test_db; |
14 | pub mod ast_transform; | 14 | pub mod ast_transform; |
15 | 15 | ||
16 | use either::Either; | ||
16 | use hir::db::HirDatabase; | 17 | use hir::db::HirDatabase; |
17 | use itertools::Either; | ||
18 | use ra_db::FileRange; | 18 | use ra_db::FileRange; |
19 | use ra_syntax::{TextRange, TextUnit}; | 19 | use ra_syntax::{TextRange, TextUnit}; |
20 | use ra_text_edit::TextEdit; | 20 | use ra_text_edit::TextEdit; |
diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs index e30eee5f4..a936900da 100644 --- a/crates/ra_ide/src/assists.rs +++ b/crates/ra_ide/src/assists.rs | |||
@@ -4,7 +4,7 @@ use ra_db::{FilePosition, FileRange}; | |||
4 | 4 | ||
5 | use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit}; | 5 | use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit}; |
6 | 6 | ||
7 | use itertools::Either; | 7 | use either::Either; |
8 | pub use ra_assists::AssistId; | 8 | pub use ra_assists::AssistId; |
9 | use ra_assists::{AssistAction, AssistLabel}; | 9 | use ra_assists::{AssistAction, AssistLabel}; |
10 | 10 | ||
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 73bce8b08..579158780 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -28,7 +28,7 @@ ra_prof = { path = "../ra_prof" } | |||
28 | ra_vfs_glob = { path = "../ra_vfs_glob" } | 28 | ra_vfs_glob = { path = "../ra_vfs_glob" } |
29 | env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } | 29 | env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } |
30 | ra_cargo_watch = { path = "../ra_cargo_watch" } | 30 | ra_cargo_watch = { path = "../ra_cargo_watch" } |
31 | itertools = "0.8" | 31 | either = "1.5" |
32 | 32 | ||
33 | [dev-dependencies] | 33 | [dev-dependencies] |
34 | tempfile = "3" | 34 | tempfile = "3" |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index d76639474..9e9964880 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | use std::{fmt::Write as _, io::Write as _}; | 4 | use std::{fmt::Write as _, io::Write as _}; |
5 | 5 | ||
6 | use itertools::Either; | 6 | use either::Either; |
7 | use lsp_server::ErrorCode; | 7 | use lsp_server::ErrorCode; |
8 | use lsp_types::{ | 8 | use lsp_types::{ |
9 | CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem, | 9 | CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem, |