diff options
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 5 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/path_map.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/project_model.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/thread_watcher.rs | 5 |
4 files changed, 9 insertions, 9 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 78a8ccfc5..673f1bf7d 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -1,5 +1,6 @@ | |||
1 | use rustc_hash::FxHashMap; | 1 | use std::collections::HashMap; |
2 | 2 | ||
3 | use rustc_hash::FxHashMap; | ||
3 | use languageserver_types::{ | 4 | use languageserver_types::{ |
4 | CodeActionResponse, Command, CompletionItem, CompletionItemKind, Diagnostic, | 5 | CodeActionResponse, Command, CompletionItem, CompletionItemKind, Diagnostic, |
5 | DiagnosticSeverity, DocumentSymbol, FoldingRange, FoldingRangeKind, FoldingRangeParams, | 6 | DiagnosticSeverity, DocumentSymbol, FoldingRange, FoldingRangeKind, FoldingRangeParams, |
@@ -18,8 +19,6 @@ use crate::{ | |||
18 | Result, | 19 | Result, |
19 | }; | 20 | }; |
20 | 21 | ||
21 | use std::collections::HashMap; | ||
22 | |||
23 | pub fn handle_syntax_tree( | 22 | pub fn handle_syntax_tree( |
24 | world: ServerWorld, | 23 | world: ServerWorld, |
25 | params: req::SyntaxTreeParams, | 24 | params: req::SyntaxTreeParams, |
diff --git a/crates/ra_lsp_server/src/path_map.rs b/crates/ra_lsp_server/src/path_map.rs index 585013acd..d32829382 100644 --- a/crates/ra_lsp_server/src/path_map.rs +++ b/crates/ra_lsp_server/src/path_map.rs | |||
@@ -1,9 +1,9 @@ | |||
1 | use std::path::{Component, Path, PathBuf}; | ||
2 | |||
1 | use im; | 3 | use im; |
2 | use ra_analysis::{FileId, FileResolver}; | 4 | use ra_analysis::{FileId, FileResolver}; |
3 | use relative_path::RelativePath; | 5 | use relative_path::RelativePath; |
4 | 6 | ||
5 | use std::path::{Component, Path, PathBuf}; | ||
6 | |||
7 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] | 7 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] |
8 | pub enum Root { | 8 | pub enum Root { |
9 | Workspace, | 9 | Workspace, |
diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs index d170ceb73..04e2ef9c8 100644 --- a/crates/ra_lsp_server/src/project_model.rs +++ b/crates/ra_lsp_server/src/project_model.rs | |||
@@ -1,9 +1,9 @@ | |||
1 | use std::path::{Path, PathBuf}; | ||
2 | |||
1 | use cargo_metadata::{metadata_run, CargoOpt}; | 3 | use cargo_metadata::{metadata_run, CargoOpt}; |
2 | use ra_syntax::SmolStr; | 4 | use ra_syntax::SmolStr; |
3 | use rustc_hash::{FxHashMap, FxHashSet}; | 5 | use rustc_hash::{FxHashMap, FxHashSet}; |
4 | 6 | ||
5 | use std::path::{Path, PathBuf}; | ||
6 | |||
7 | use crate::{ | 7 | use crate::{ |
8 | thread_watcher::{ThreadWatcher, Worker}, | 8 | thread_watcher::{ThreadWatcher, Worker}, |
9 | Result, | 9 | Result, |
diff --git a/crates/ra_lsp_server/src/thread_watcher.rs b/crates/ra_lsp_server/src/thread_watcher.rs index 67952eb74..51b35fa66 100644 --- a/crates/ra_lsp_server/src/thread_watcher.rs +++ b/crates/ra_lsp_server/src/thread_watcher.rs | |||
@@ -1,8 +1,9 @@ | |||
1 | use crate::Result; | 1 | use std::thread; |
2 | |||
2 | use crossbeam_channel::{bounded, unbounded, Receiver, Sender}; | 3 | use crossbeam_channel::{bounded, unbounded, Receiver, Sender}; |
3 | use drop_bomb::DropBomb; | 4 | use drop_bomb::DropBomb; |
4 | 5 | ||
5 | use std::thread; | 6 | use crate::Result; |
6 | 7 | ||
7 | pub struct Worker<I, O> { | 8 | pub struct Worker<I, O> { |
8 | pub inp: Sender<I>, | 9 | pub inp: Sender<I>, |