diff options
author | Aleksey Kladov <[email protected]> | 2020-06-11 10:04:09 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-06-23 16:51:06 +0100 |
commit | dad1333b48c38bc7a5628fc0ff5304d003776a85 (patch) | |
tree | 29be52a980b4cae72f46a48c48135a15e31641e0 /crates/rust-analyzer/src/cargo_target_spec.rs | |
parent | 7aa66371ee3e8b31217513204c8b4f683584419d (diff) |
New VFS
Diffstat (limited to 'crates/rust-analyzer/src/cargo_target_spec.rs')
-rw-r--r-- | crates/rust-analyzer/src/cargo_target_spec.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs index 5c22dce0d..65f90c83c 100644 --- a/crates/rust-analyzer/src/cargo_target_spec.rs +++ b/crates/rust-analyzer/src/cargo_target_spec.rs | |||
@@ -1,5 +1,7 @@ | |||
1 | //! See `CargoTargetSpec` | 1 | //! See `CargoTargetSpec` |
2 | 2 | ||
3 | use std::path::PathBuf; | ||
4 | |||
3 | use ra_cfg::CfgExpr; | 5 | use ra_cfg::CfgExpr; |
4 | use ra_ide::{FileId, RunnableKind, TestId}; | 6 | use ra_ide::{FileId, RunnableKind, TestId}; |
5 | use ra_project_model::{self, TargetKind}; | 7 | use ra_project_model::{self, TargetKind}; |
@@ -12,6 +14,7 @@ use crate::{global_state::GlobalStateSnapshot, Result}; | |||
12 | /// build/test/run the target. | 14 | /// build/test/run the target. |
13 | #[derive(Clone)] | 15 | #[derive(Clone)] |
14 | pub(crate) struct CargoTargetSpec { | 16 | pub(crate) struct CargoTargetSpec { |
17 | pub(crate) workspace_root: PathBuf, | ||
15 | pub(crate) package: String, | 18 | pub(crate) package: String, |
16 | pub(crate) target: String, | 19 | pub(crate) target: String, |
17 | pub(crate) target_kind: TargetKind, | 20 | pub(crate) target_kind: TargetKind, |
@@ -101,6 +104,7 @@ impl CargoTargetSpec { | |||
101 | None => return Ok(None), | 104 | None => return Ok(None), |
102 | }; | 105 | }; |
103 | let res = CargoTargetSpec { | 106 | let res = CargoTargetSpec { |
107 | workspace_root: cargo_ws.workspace_root().to_path_buf(), | ||
104 | package: cargo_ws.package_flag(&cargo_ws[cargo_ws[target].package]), | 108 | package: cargo_ws.package_flag(&cargo_ws[cargo_ws[target].package]), |
105 | target: cargo_ws[target].name.clone(), | 109 | target: cargo_ws[target].name.clone(), |
106 | target_kind: cargo_ws[target].kind, | 110 | target_kind: cargo_ws[target].kind, |