Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

itertools::Either -> either::Either

Browse source
This commit is contained in:
Kirill Bulatov 2020-01-15 20:20:20 +02:00
parent 78a21253b4
commit d51cf7794d
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -869,8 +869,8 @@ version = "0.1.0"
name = "ra_assists" name = "ra_assists"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ra_db 0.1.0", "ra_db 0.1.0",
"ra_fmt 0.1.0", "ra_fmt 0.1.0",
@ -1066,8 +1066,8 @@ name = "ra_lsp_server"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

2
crates/ra_assists/Cargo.toml
View file

@ -11,7 +11,7 @@ doctest = false
format-buf = "1.0.0" format-buf = "1.0.0"
join_to_string = "0.1.3" join_to_string = "0.1.3"
rustc-hash = "1.0" rustc-hash = "1.0"
itertools = "0.8.0" either = "1.5"
ra_syntax = { path = "../ra_syntax" } ra_syntax = { path = "../ra_syntax" }
ra_text_edit = { path = "../ra_text_edit" } ra_text_edit = { path = "../ra_text_edit" }

2
crates/ra_assists/src/assist_ctx.rs
View file

@ -1,6 +1,6 @@
//! This module defines `AssistCtx` -- the API surface that is exposed to assists. //! This module defines `AssistCtx` -- the API surface that is exposed to assists.
use either::Either;
use hir::{db::HirDatabase, InFile, SourceAnalyzer}; use hir::{db::HirDatabase, InFile, SourceAnalyzer};
use itertools::Either;
use ra_db::FileRange; use ra_db::FileRange;
use ra_fmt::{leading_indent, reindent}; use ra_fmt::{leading_indent, reindent};
use ra_syntax::{ use ra_syntax::{

2
crates/ra_assists/src/lib.rs
View file

@ -13,8 +13,8 @@ mod doc_tests;
mod test_db; mod test_db;
pub mod ast_transform; pub mod ast_transform;
use either::Either;
use hir::db::HirDatabase; use hir::db::HirDatabase;
use itertools::Either;
use ra_db::FileRange; use ra_db::FileRange;
use ra_syntax::{TextRange, TextUnit}; use ra_syntax::{TextRange, TextUnit};
use ra_text_edit::TextEdit; use ra_text_edit::TextEdit;

2
crates/ra_ide/src/assists.rs
View file

@ -4,7 +4,7 @@ use ra_db::{FilePosition, FileRange};
use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit}; use crate::{db::RootDatabase, FileId, SourceChange, SourceFileEdit};
use itertools::Either; use either::Either;
pub use ra_assists::AssistId; pub use ra_assists::AssistId;
use ra_assists::{AssistAction, AssistLabel}; use ra_assists::{AssistAction, AssistLabel};

2
crates/ra_lsp_server/Cargo.toml
View file

@ -28,7 +28,7 @@ ra_prof = { path = "../ra_prof" }
ra_vfs_glob = { path = "../ra_vfs_glob" } ra_vfs_glob = { path = "../ra_vfs_glob" }
env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] }
ra_cargo_watch = { path = "../ra_cargo_watch" } ra_cargo_watch = { path = "../ra_cargo_watch" }
itertools = "0.8" either = "1.5"
[dev-dependencies] [dev-dependencies]
tempfile = "3" tempfile = "3"

2
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -3,7 +3,7 @@
use std::{fmt::Write as _, io::Write as _}; use std::{fmt::Write as _, io::Write as _};
use itertools::Either; use either::Either;
use lsp_server::ErrorCode; use lsp_server::ErrorCode;
use lsp_types::{ use lsp_types::{
CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,