diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2024-08-03 18:00:36 +0200 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2024-08-05 13:03:03 +0200 |
| commit | 2e7db9c69ffeb58cb512e84a88ab5dced33abcf2 (patch) | |
| tree | 0a63402fe8f80eb05e5a193dee09ce1915458e64 /src/tools/rust-analyzer/crates/project-model | |
| parent | d84b970e6046b3212c918af52fd9f2c15630c862 (diff) | |
Simplify FileDelegate
Diffstat (limited to 'src/tools/rust-analyzer/crates/project-model')
| -rw-r--r-- | src/tools/rust-analyzer/crates/project-model/src/workspace.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tools/rust-analyzer/crates/project-model/src/workspace.rs b/src/tools/rust-analyzer/crates/project-model/src/workspace.rs index c90543d0ead..9156c8da33a 100644 --- a/src/tools/rust-analyzer/crates/project-model/src/workspace.rs +++ b/src/tools/rust-analyzer/crates/project-model/src/workspace.rs @@ -1349,12 +1349,13 @@ fn add_target_crate_root( ); if let TargetKind::Lib { is_proc_macro: true } = kind { let proc_macro = match build_data.as_ref().map(|it| it.proc_macro_dylib_path.as_ref()) { - Some(it) => it.cloned().map(|path| Ok((cargo_name.to_owned(), path))), - None => Some(Err("proc-macro crate is missing its build data".to_owned())), + Some(it) => match it { + Some(path) => Ok((cargo_name.to_owned(), path.clone())), + None => Err("proc-macro crate build data is missing dylib path".to_owned()), + }, + None => Err("proc-macro crate is missing its build data".to_owned()), }; - if let Some(proc_macro) = proc_macro { - proc_macros.insert(crate_id, proc_macro); - } + proc_macros.insert(crate_id, proc_macro); } crate_id |
