aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/cli/load_cargo.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/rust-analyzer/src/cli/load_cargo.rs')
-rw-r--r--crates/rust-analyzer/src/cli/load_cargo.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index 23442afac..310c36904 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -23,7 +23,7 @@ pub fn load_workspace_at(
23 cargo_config: &CargoConfig, 23 cargo_config: &CargoConfig,
24 load_config: &LoadCargoConfig, 24 load_config: &LoadCargoConfig,
25 progress: &dyn Fn(String), 25 progress: &dyn Fn(String),
26) -> Result<(AnalysisHost, vfs::Vfs)> { 26) -> Result<(AnalysisHost, vfs::Vfs, Option<ProcMacroClient>)> {
27 let root = AbsPathBuf::assert(std::env::current_dir()?.join(root)); 27 let root = AbsPathBuf::assert(std::env::current_dir()?.join(root));
28 let root = ProjectManifest::discover_single(&root)?; 28 let root = ProjectManifest::discover_single(&root)?;
29 let workspace = ProjectWorkspace::load(root, cargo_config, progress)?; 29 let workspace = ProjectWorkspace::load(root, cargo_config, progress)?;
@@ -35,7 +35,7 @@ pub fn load_workspace(
35 ws: ProjectWorkspace, 35 ws: ProjectWorkspace,
36 config: &LoadCargoConfig, 36 config: &LoadCargoConfig,
37 progress: &dyn Fn(String), 37 progress: &dyn Fn(String),
38) -> Result<(AnalysisHost, vfs::Vfs)> { 38) -> Result<(AnalysisHost, vfs::Vfs, Option<ProcMacroClient>)> {
39 let (sender, receiver) = unbounded(); 39 let (sender, receiver) = unbounded();
40 let mut vfs = vfs::Vfs::default(); 40 let mut vfs = vfs::Vfs::default();
41 let mut loader = { 41 let mut loader = {
@@ -80,7 +80,7 @@ pub fn load_workspace(
80 log::debug!("crate graph: {:?}", crate_graph); 80 log::debug!("crate graph: {:?}", crate_graph);
81 let host = 81 let host =
82 load_crate_graph(crate_graph, project_folders.source_root_config, &mut vfs, &receiver); 82 load_crate_graph(crate_graph, project_folders.source_root_config, &mut vfs, &receiver);
83 Ok((host, vfs)) 83 Ok((host, vfs, proc_macro_client))
84} 84}
85 85
86fn load_crate_graph( 86fn load_crate_graph(
@@ -138,7 +138,8 @@ mod tests {
138 let cargo_config = Default::default(); 138 let cargo_config = Default::default();
139 let load_cargo_config = 139 let load_cargo_config =
140 LoadCargoConfig { load_out_dirs_from_check: false, with_proc_macro: false }; 140 LoadCargoConfig { load_out_dirs_from_check: false, with_proc_macro: false };
141 let (host, _vfs) = load_workspace_at(path, &cargo_config, &load_cargo_config, &|_| {})?; 141 let (host, _vfs, _proc_macro) =
142 load_workspace_at(path, &cargo_config, &load_cargo_config, &|_| {})?;
142 143
143 let n_crates = Crate::all(host.raw_database()).len(); 144 let n_crates = Crate::all(host.raw_database()).len();
144 // RA has quite a few crates, but the exact count doesn't matter 145 // RA has quite a few crates, but the exact count doesn't matter