aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Bulatov <[email protected]>2020-01-15 18:20:20 +0000
committerKirill Bulatov <[email protected]>2020-01-15 18:20:20 +0000
commitd51cf7794d110b064fd0e8d53726b4608ec50d1a (patch)
tree4cc529cede52694d63626dc1746b0f0971eaadb3
parent78a21253b494e573885ac8336bff6e93b401046f (diff)
itertools::Either -> either::Either
-rw-r--r--Cargo.lock4
-rw-r--r--crates/ra_assists/Cargo.toml2
-rw-r--r--crates/ra_assists/src/assist_ctx.rs2
-rw-r--r--crates/ra_assists/src/lib.rs2
-rw-r--r--crates/ra_ide/src/assists.rs2
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs2
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"
869name = "ra_assists" 869name = "ra_assists"
870version = "0.1.0" 870version = "0.1.0"
871dependencies = [ 871dependencies = [
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"
1066version = "0.1.0" 1066version = "0.1.0"
1067dependencies = [ 1067dependencies = [
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
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.0" 13rustc-hash = "1.0"
14itertools = "0.8.0" 14either = "1.5"
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_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.
2use either::Either;
2use hir::{db::HirDatabase, InFile, SourceAnalyzer}; 3use hir::{db::HirDatabase, InFile, SourceAnalyzer};
3use itertools::Either;
4use ra_db::FileRange; 4use ra_db::FileRange;
5use ra_fmt::{leading_indent, reindent}; 5use ra_fmt::{leading_indent, reindent};
6use ra_syntax::{ 6use 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;
13mod test_db; 13mod test_db;
14pub mod ast_transform; 14pub mod ast_transform;
15 15
16use either::Either;
16use hir::db::HirDatabase; 17use hir::db::HirDatabase;
17use itertools::Either;
18use ra_db::FileRange; 18use ra_db::FileRange;
19use ra_syntax::{TextRange, TextUnit}; 19use ra_syntax::{TextRange, TextUnit};
20use ra_text_edit::TextEdit; 20use 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
5use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit}; 5use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit};
6 6
7use itertools::Either; 7use either::Either;
8pub use ra_assists::AssistId; 8pub use ra_assists::AssistId;
9use ra_assists::{AssistAction, AssistLabel}; 9use 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" }
28ra_vfs_glob = { path = "../ra_vfs_glob" } 28ra_vfs_glob = { path = "../ra_vfs_glob" }
29env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } 29env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] }
30ra_cargo_watch = { path = "../ra_cargo_watch" } 30ra_cargo_watch = { path = "../ra_cargo_watch" }
31itertools = "0.8" 31either = "1.5"
32 32
33[dev-dependencies] 33[dev-dependencies]
34tempfile = "3" 34tempfile = "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
4use std::{fmt::Write as _, io::Write as _}; 4use std::{fmt::Write as _, io::Write as _};
5 5
6use itertools::Either; 6use either::Either;
7use lsp_server::ErrorCode; 7use lsp_server::ErrorCode;
8use lsp_types::{ 8use lsp_types::{
9 CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem, 9 CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,