diff options
| author | Jonas Schievink <[email protected]> | 2020-12-07 16:16:50 +0000 |
|---|---|---|
| committer | Jonas Schievink <[email protected]> | 2020-12-07 16:16:50 +0000 |
| commit | 2b2318e695e85d64c6a976a810620c77b7ccba6e (patch) | |
| tree | 2ec1166251fd2791cbd77372dbae29aa51522a3f /crates/rust-analyzer/src/cli | |
| parent | fb21a215be0968d1102aba842c0fdedcd401cb15 (diff) | |
Remove dummy ProcMacroClient in favor of Option
Diffstat (limited to 'crates/rust-analyzer/src/cli')
| -rw-r--r-- | crates/rust-analyzer/src/cli/load_cargo.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs index 76526c66c..d51f4a93a 100644 --- a/crates/rust-analyzer/src/cli/load_cargo.rs +++ b/crates/rust-analyzer/src/cli/load_cargo.rs | |||
| @@ -33,12 +33,12 @@ pub fn load_cargo( | |||
| 33 | 33 | ||
| 34 | let proc_macro_client = if with_proc_macro { | 34 | let proc_macro_client = if with_proc_macro { |
| 35 | let path = std::env::current_exe()?; | 35 | let path = std::env::current_exe()?; |
| 36 | ProcMacroClient::extern_process(path, &["proc-macro"]).unwrap() | 36 | Some(ProcMacroClient::extern_process(path, &["proc-macro"]).unwrap()) |
| 37 | } else { | 37 | } else { |
| 38 | ProcMacroClient::dummy() | 38 | None |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | let crate_graph = ws.to_crate_graph(None, &proc_macro_client, &mut |path: &AbsPath| { | 41 | let crate_graph = ws.to_crate_graph(None, proc_macro_client.as_ref(), &mut |path: &AbsPath| { |
| 42 | let contents = loader.load_sync(path); | 42 | let contents = loader.load_sync(path); |
| 43 | let path = vfs::VfsPath::from(path.to_path_buf()); | 43 | let path = vfs::VfsPath::from(path.to_path_buf()); |
| 44 | vfs.set_file_contents(path.clone(), contents); | 44 | vfs.set_file_contents(path.clone(), contents); |