diff options
author | Aleksey Kladov <[email protected]> | 2020-06-03 11:05:50 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-06-03 11:05:50 +0100 |
commit | 03a76191a18b450a8e4ae309296fd7c0614d14d2 (patch) | |
tree | bcc25e58278379aff447e9d8f3ce5c5402649e6b /crates/rust-analyzer/src/main_loop.rs | |
parent | 0a88de809f13f3b4abe0ffa11ff87c6f845050bd (diff) |
Rename ProjectRoot -> ProjectManifest
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 82348c6fc..ea5b4c91c 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -28,7 +28,7 @@ use lsp_types::{ | |||
28 | use ra_flycheck::{CheckTask, Status}; | 28 | use ra_flycheck::{CheckTask, Status}; |
29 | use ra_ide::{Canceled, FileId, LibraryData, LineIndex, SourceRootId}; | 29 | use ra_ide::{Canceled, FileId, LibraryData, LineIndex, SourceRootId}; |
30 | use ra_prof::profile; | 30 | use ra_prof::profile; |
31 | use ra_project_model::{PackageRoot, ProjectRoot, ProjectWorkspace}; | 31 | use ra_project_model::{PackageRoot, ProjectManifest, ProjectWorkspace}; |
32 | use ra_vfs::{VfsFile, VfsTask, Watch}; | 32 | use ra_vfs::{VfsFile, VfsTask, Watch}; |
33 | use relative_path::RelativePathBuf; | 33 | use relative_path::RelativePathBuf; |
34 | use rustc_hash::FxHashSet; | 34 | use rustc_hash::FxHashSet; |
@@ -96,7 +96,7 @@ pub fn main_loop(ws_roots: Vec<PathBuf>, config: Config, connection: Connection) | |||
96 | let mut global_state = { | 96 | let mut global_state = { |
97 | let workspaces = { | 97 | let workspaces = { |
98 | // FIXME: support dynamic workspace loading. | 98 | // FIXME: support dynamic workspace loading. |
99 | let project_roots = ProjectRoot::discover_all(&ws_roots); | 99 | let project_roots = ProjectManifest::discover_all(&ws_roots); |
100 | 100 | ||
101 | if project_roots.is_empty() && config.notifications.cargo_toml_not_found { | 101 | if project_roots.is_empty() && config.notifications.cargo_toml_not_found { |
102 | show_message( | 102 | show_message( |