Skip to content

Commit 6fd469c

Browse files
committed
Rust: use autodiscovery for sysroot
This should make the rust-analyzer library look for a rust toolchain and try to start the proc-macro server.
1 parent d93330b commit 6fd469c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

rust/extractor/src/main.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use ra_ap_hir::AdtId::{EnumId, StructId, UnionId};
77
use ra_ap_hir::{Crate, ModuleDefId};
88
use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
99
use ra_ap_project_model::CargoConfig;
10+
use ra_ap_project_model::RustLibSource;
11+
use ra_ap_vfs::AbsPathBuf;
1012
use std::fs;
1113
use std::path::{Path, PathBuf};
1214

@@ -30,18 +32,19 @@ fn main() -> anyhow::Result<()> {
3032
};
3133

3234
let config = CargoConfig {
35+
sysroot: Some(RustLibSource::Discover),
3336
..Default::default()
3437
};
35-
let no_progress = |_| ();
38+
let progress = |t| (println!("progress: {}", t));
3639
let load_config = LoadCargoConfig {
3740
load_out_dirs_from_check: true,
3841
with_proc_macro_server: ProcMacroServerChoice::Sysroot,
3942
prefill_caches: false,
4043
};
4144
for input in cfg.inputs {
42-
let (db, vfs, _macro_server) =
43-
load_workspace_at(&input, &config, &load_config, &no_progress)
44-
.context("loading inputs")?;
45+
let (db, vfs, _macro_server) = load_workspace_at(&input, &config, &load_config, &progress)
46+
.context("loading inputs")?;
47+
_macro_server.expect("no macro server");
4548
let crates = <dyn DefDatabase>::crate_graph(&db);
4649
for crate_id in crates.iter() {
4750
let krate = Crate::from(crate_id);

0 commit comments

Comments
 (0)