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

Remove dummy ProcMacroClient in favor of Option

Browse Source
This commit is contained in:
Jonas Schievink
2020-12-07 17:16:50 +01:00
parent fb21a215be
commit 2b2318e695
5 changed files with 59 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/rust-analyzer/src/cli/load_cargo.rs
View File

@@ -33,12 +33,12 @@ pub fn load_cargo(
let proc_macro_client = if with_proc_macro {
let path = std::env::current_exe()?;
ProcMacroClient::extern_process(path, &["proc-macro"]).unwrap()
Some(ProcMacroClient::extern_process(path, &["proc-macro"]).unwrap())
} else {
ProcMacroClient::dummy()
None
};
let crate_graph = ws.to_crate_graph(None, &proc_macro_client, &mut |path: &AbsPath| {
let crate_graph = ws.to_crate_graph(None, proc_macro_client.as_ref(), &mut |path: &AbsPath| {
let contents = loader.load_sync(path);
let path = vfs::VfsPath::from(path.to_path_buf());
vfs.set_file_contents(path.clone(), contents);