Skip to content

Commit 4466e07

Browse files
Merge #9874
9874: fix: Always add implicit `proc_macro` dependency r=jonas-schievink a=jonas-schievink Even crates that don't set `proc-macro = true` are allowed to depend on `proc_macro` (just none of the APIs work when called outside of a proc macro). Fixes #9857 bors r+ Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2 parents baf1494 + 6f579c4 commit 4466e07

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

crates/project_model/src/workspace.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -533,15 +533,13 @@ fn cargo_to_crate_graph(
533533
lib_tgt = Some((crate_id, cargo[tgt].name.clone()));
534534
pkg_to_lib_crate.insert(pkg, crate_id);
535535
}
536-
if cargo[tgt].is_proc_macro {
537-
if let Some(proc_macro) = libproc_macro {
538-
add_dep(
539-
&mut crate_graph,
540-
crate_id,
541-
CrateName::new("proc_macro").unwrap(),
542-
proc_macro,
543-
);
544-
}
536+
if let Some(proc_macro) = libproc_macro {
537+
add_dep(
538+
&mut crate_graph,
539+
crate_id,
540+
CrateName::new("proc_macro").unwrap(),
541+
proc_macro,
542+
);
545543
}
546544

547545
pkg_crates.entry(pkg).or_insert_with(Vec::new).push((crate_id, cargo[tgt].kind));

0 commit comments

Comments
 (0)