diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-03 10:08:20 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-03 10:08:20 +0100 |
commit | 5100f7707356046228eb4e0cde1f9db0d674bdd9 (patch) | |
tree | ba6b3e51ebb580184e2c44c90763efe12908904f /crates/ra_project_model/src | |
parent | ac4782ef11706c39117286ddffc3e44fb7e61888 (diff) | |
parent | ee181cf6833f338869f878eff11e026abe4e984e (diff) |
Merge #4723
4723: Derive local roots from Workspaces r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_project_model/src')
-rw-r--r-- | crates/ra_project_model/src/json_project.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_project_model/src/json_project.rs b/crates/ra_project_model/src/json_project.rs index bd2bae15e..09c06fef9 100644 --- a/crates/ra_project_model/src/json_project.rs +++ b/crates/ra_project_model/src/json_project.rs | |||
@@ -5,6 +5,13 @@ use std::path::PathBuf; | |||
5 | use rustc_hash::{FxHashMap, FxHashSet}; | 5 | use rustc_hash::{FxHashMap, FxHashSet}; |
6 | use serde::Deserialize; | 6 | use serde::Deserialize; |
7 | 7 | ||
8 | /// Roots and crates that compose this Rust project. | ||
9 | #[derive(Clone, Debug, Deserialize)] | ||
10 | pub struct JsonProject { | ||
11 | pub(crate) roots: Vec<Root>, | ||
12 | pub(crate) crates: Vec<Crate>, | ||
13 | } | ||
14 | |||
8 | /// A root points to the directory which contains Rust crates. rust-analyzer watches all files in | 15 | /// A root points to the directory which contains Rust crates. rust-analyzer watches all files in |
9 | /// all roots. Roots might be nested. | 16 | /// all roots. Roots might be nested. |
10 | #[derive(Clone, Debug, Deserialize)] | 17 | #[derive(Clone, Debug, Deserialize)] |
@@ -57,13 +64,6 @@ pub struct Dep { | |||
57 | pub(crate) name: String, | 64 | pub(crate) name: String, |
58 | } | 65 | } |
59 | 66 | ||
60 | /// Roots and crates that compose this Rust project. | ||
61 | #[derive(Clone, Debug, Deserialize)] | ||
62 | pub struct JsonProject { | ||
63 | pub(crate) roots: Vec<Root>, | ||
64 | pub(crate) crates: Vec<Crate>, | ||
65 | } | ||
66 | |||
67 | #[cfg(test)] | 67 | #[cfg(test)] |
68 | mod tests { | 68 | mod tests { |
69 | use super::*; | 69 | use super::*; |