rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename ProjectRoot -> ProjectManifest

Browse Source
This commit is contained in:
Aleksey Kladov
2020-06-03 12:05:50 +02:00
parent 0a88de809f
commit 03a76191a1
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rust-analyzer/src/main_loop.rs
View File

@@ -28,7 +28,7 @@ use lsp_types::{
use ra_flycheck::{CheckTask, Status};
use ra_ide::{Canceled, FileId, LibraryData, LineIndex, SourceRootId};
use ra_prof::profile;
use ra_project_model::{PackageRoot, ProjectRoot, ProjectWorkspace};
use ra_project_model::{PackageRoot, ProjectManifest, ProjectWorkspace};
use ra_vfs::{VfsFile, VfsTask, Watch};
use relative_path::RelativePathBuf;
use rustc_hash::FxHashSet;
@@ -96,7 +96,7 @@ pub fn main_loop(ws_roots: Vec<PathBuf>, config: Config, connection: Connection)
let mut global_state = {
let workspaces = {
// FIXME: support dynamic workspace loading.
let project_roots = ProjectRoot::discover_all(&ws_roots);
let project_roots = ProjectManifest::discover_all(&ws_roots);
if project_roots.is_empty() && config.notifications.cargo_toml_not_found {
show_message(