Unnamed repository; edit this file 'description' to name the repository.
Merge #10460
10460: fix: Only add `proc_macro` to prelude in proc-macro crates r=jonas-schievink a=jonas-schievink Fixes https://github.com/rust-analyzer/rust-analyzer/issues/10455 bors r+ Co-authored-by: Jonas Schievink <[email protected]>
bors[bot] 2021-10-04
parent 5bdae82 · parent 0cd24c1 · commit bf81723
-rw-r--r--crates/project_model/src/workspace.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 714e2dd301..cb79ce08ba 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -563,11 +563,12 @@ fn cargo_to_crate_graph(
pkg_to_lib_crate.insert(pkg, crate_id);
}
if let Some(proc_macro) = libproc_macro {
- add_dep(
+ add_dep_with_prelude(
&mut crate_graph,
crate_id,
CrateName::new("proc_macro").unwrap(),
proc_macro,
+ cargo[tgt].is_proc_macro,
);
}