diff options
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/src/main.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/project_model.rs | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/vfs.rs | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index 9f62347f1..c07eb0140 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs | |||
@@ -18,7 +18,7 @@ fn main() -> Result<()> { | |||
18 | .directory("log") | 18 | .directory("log") |
19 | .start()?; | 19 | .start()?; |
20 | info!("lifecycle: server started"); | 20 | info!("lifecycle: server started"); |
21 | match ::std::panic::catch_unwind(|| main_inner()) { | 21 | match ::std::panic::catch_unwind(main_inner) { |
22 | Ok(res) => { | 22 | Ok(res) => { |
23 | info!("lifecycle: terminating process with {:?}", res); | 23 | info!("lifecycle: terminating process with {:?}", res); |
24 | res | 24 | res |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 49bd7895a..3e58e6f54 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -289,8 +289,8 @@ pub fn handle_runnables( | |||
289 | .filter_map(|ws| { | 289 | .filter_map(|ws| { |
290 | let tgt = ws.target_by_root(path)?; | 290 | let tgt = ws.target_by_root(path)?; |
291 | Some(( | 291 | Some(( |
292 | tgt.package(ws).name(ws).clone(), | 292 | tgt.package(ws).name(ws), |
293 | tgt.name(ws).clone(), | 293 | tgt.name(ws), |
294 | tgt.kind(ws), | 294 | tgt.kind(ws), |
295 | )) | 295 | )) |
296 | }) | 296 | }) |
diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs index d170ceb73..cedb67bae 100644 --- a/crates/ra_lsp_server/src/project_model.rs +++ b/crates/ra_lsp_server/src/project_model.rs | |||
@@ -173,7 +173,6 @@ pub fn workspace_loader() -> (Worker<PathBuf, Result<CargoWorkspace>>, ThreadWat | |||
173 | 1, | 173 | 1, |
174 | |input_receiver, output_sender| { | 174 | |input_receiver, output_sender| { |
175 | input_receiver | 175 | input_receiver |
176 | .into_iter() | ||
177 | .map(|path| CargoWorkspace::from_cargo_metadata(path.as_path())) | 176 | .map(|path| CargoWorkspace::from_cargo_metadata(path.as_path())) |
178 | .for_each(|it| output_sender.send(it)) | 177 | .for_each(|it| output_sender.send(it)) |
179 | }, | 178 | }, |
diff --git a/crates/ra_lsp_server/src/vfs.rs b/crates/ra_lsp_server/src/vfs.rs index 417a3c19a..6e317d854 100644 --- a/crates/ra_lsp_server/src/vfs.rs +++ b/crates/ra_lsp_server/src/vfs.rs | |||
@@ -24,7 +24,6 @@ pub fn roots_loader() -> (Worker<PathBuf, (PathBuf, Vec<FileEvent>)>, ThreadWatc | |||
24 | 128, | 24 | 128, |
25 | |input_receiver, output_sender| { | 25 | |input_receiver, output_sender| { |
26 | input_receiver | 26 | input_receiver |
27 | .into_iter() | ||
28 | .map(|path| { | 27 | .map(|path| { |
29 | debug!("loading {} ...", path.as_path().display()); | 28 | debug!("loading {} ...", path.as_path().display()); |
30 | let events = load_root(path.as_path()); | 29 | let events = load_root(path.as_path()); |