diff options
author | Pavan Kumar Sunkara <[email protected]> | 2020-08-13 11:05:30 +0100 |
---|---|---|
committer | Pavan Kumar Sunkara <[email protected]> | 2020-08-13 11:05:30 +0100 |
commit | eac24d52e672c0a9c118e8969bf1b839c3e7f1f3 (patch) | |
tree | 4e1218cc53bef75f54df35be80c6a254b85b8d9c /crates/rust-analyzer/src/reload.rs | |
parent | b5cb16fb90b4a1076604c5795552ee4abe07a057 (diff) |
Rename ra_project_model -> project_model
Diffstat (limited to 'crates/rust-analyzer/src/reload.rs')
-rw-r--r-- | crates/rust-analyzer/src/reload.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index 611c9a89f..640417dc6 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs | |||
@@ -2,9 +2,9 @@ | |||
2 | use std::{mem, sync::Arc}; | 2 | use std::{mem, sync::Arc}; |
3 | 3 | ||
4 | use flycheck::FlycheckHandle; | 4 | use flycheck::FlycheckHandle; |
5 | use project_model::{ProcMacroClient, ProjectWorkspace}; | ||
5 | use ra_db::{CrateGraph, SourceRoot, VfsPath}; | 6 | use ra_db::{CrateGraph, SourceRoot, VfsPath}; |
6 | use ra_ide::AnalysisChange; | 7 | use ra_ide::AnalysisChange; |
7 | use ra_project_model::{ProcMacroClient, ProjectWorkspace}; | ||
8 | use vfs::{file_set::FileSetConfig, AbsPath, AbsPathBuf, ChangeKind}; | 8 | use vfs::{file_set::FileSetConfig, AbsPath, AbsPathBuf, ChangeKind}; |
9 | 9 | ||
10 | use crate::{ | 10 | use crate::{ |
@@ -98,14 +98,14 @@ impl GlobalState { | |||
98 | .iter() | 98 | .iter() |
99 | .map(|project| match project { | 99 | .map(|project| match project { |
100 | LinkedProject::ProjectManifest(manifest) => { | 100 | LinkedProject::ProjectManifest(manifest) => { |
101 | ra_project_model::ProjectWorkspace::load( | 101 | project_model::ProjectWorkspace::load( |
102 | manifest.clone(), | 102 | manifest.clone(), |
103 | &cargo_config, | 103 | &cargo_config, |
104 | with_sysroot, | 104 | with_sysroot, |
105 | ) | 105 | ) |
106 | } | 106 | } |
107 | LinkedProject::InlineJsonProject(it) => { | 107 | LinkedProject::InlineJsonProject(it) => { |
108 | Ok(ra_project_model::ProjectWorkspace::Json { project: it.clone() }) | 108 | Ok(project_model::ProjectWorkspace::Json { project: it.clone() }) |
109 | } | 109 | } |
110 | }) | 110 | }) |
111 | .collect::<Vec<_>>(); | 111 | .collect::<Vec<_>>(); |