diff options
Diffstat (limited to 'crates/ra_lsp_server/src/cargo_target_spec.rs')
-rw-r--r-- | crates/ra_lsp_server/src/cargo_target_spec.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crates/ra_lsp_server/src/cargo_target_spec.rs b/crates/ra_lsp_server/src/cargo_target_spec.rs index 050c5fd95..a083bb311 100644 --- a/crates/ra_lsp_server/src/cargo_target_spec.rs +++ b/crates/ra_lsp_server/src/cargo_target_spec.rs | |||
@@ -1,10 +1,7 @@ | |||
1 | use crate::{ | ||
2 | project_model::{self, TargetKind}, | ||
3 | world::WorldSnapshot, | ||
4 | Result, | ||
5 | }; | ||
6 | |||
7 | use ra_ide_api::{FileId, RunnableKind}; | 1 | use ra_ide_api::{FileId, RunnableKind}; |
2 | use ra_project_model::{self, ProjectWorkspace, TargetKind}; | ||
3 | |||
4 | use crate::{world::WorldSnapshot, Result}; | ||
8 | 5 | ||
9 | pub(crate) fn runnable_args( | 6 | pub(crate) fn runnable_args( |
10 | world: &WorldSnapshot, | 7 | world: &WorldSnapshot, |
@@ -66,7 +63,7 @@ impl CargoTargetSpec { | |||
66 | let file_id = world.analysis().crate_root(crate_id)?; | 63 | let file_id = world.analysis().crate_root(crate_id)?; |
67 | let path = world.vfs.read().file2path(ra_vfs::VfsFile(file_id.0)); | 64 | let path = world.vfs.read().file2path(ra_vfs::VfsFile(file_id.0)); |
68 | let res = world.workspaces.iter().find_map(|ws| match ws { | 65 | let res = world.workspaces.iter().find_map(|ws| match ws { |
69 | project_model::ProjectWorkspace::Cargo { cargo, .. } => { | 66 | ProjectWorkspace::Cargo { cargo, .. } => { |
70 | let tgt = cargo.target_by_root(&path)?; | 67 | let tgt = cargo.target_by_root(&path)?; |
71 | Some(CargoTargetSpec { | 68 | Some(CargoTargetSpec { |
72 | package: tgt.package(&cargo).name(&cargo).to_string(), | 69 | package: tgt.package(&cargo).name(&cargo).to_string(), |
@@ -74,7 +71,7 @@ impl CargoTargetSpec { | |||
74 | target_kind: tgt.kind(&cargo), | 71 | target_kind: tgt.kind(&cargo), |
75 | }) | 72 | }) |
76 | } | 73 | } |
77 | project_model::ProjectWorkspace::Json { .. } => None, | 74 | ProjectWorkspace::Json { .. } => None, |
78 | }); | 75 | }); |
79 | Ok(res) | 76 | Ok(res) |
80 | } | 77 | } |