Skip to content

Commit

Permalink
Auto merge of #13342 - rust-lang:revert-13328-rustc-proc-macro, r=Vey…
Browse files Browse the repository at this point in the history
…kril

Revert "Add proc-macro dependency to rustc crates"

1. This panics since it indexes into the wrong thing, so fixes #13340
2. This didn't fix what I thought it would either
Reverts #13328
  • Loading branch information
bors committed Oct 4, 2022
2 parents 974caaf + e0c9e28 commit b429df2
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions crates/project-model/src/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,6 @@ fn cargo_to_crate_graph(
load_proc_macro,
&mut pkg_to_lib_crate,
&public_deps,
libproc_macro,
cargo,
&pkg_crates,
build_scripts,
Expand Down Expand Up @@ -783,7 +782,6 @@ fn handle_rustc_crates(
load_proc_macro: &mut dyn FnMut(&str, &AbsPath) -> ProcMacroLoadResult,
pkg_to_lib_crate: &mut FxHashMap<Package, CrateId>,
public_deps: &SysrootPublicDeps,
libproc_macro: Option<CrateId>,
cargo: &CargoWorkspace,
pkg_crates: &FxHashMap<Package, Vec<(CrateId, TargetKind)>>,
build_scripts: &WorkspaceBuildScripts,
Expand Down Expand Up @@ -845,19 +843,6 @@ fn handle_rustc_crates(
rustc_workspace[tgt].is_proc_macro,
);
pkg_to_lib_crate.insert(pkg, crate_id);

// 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).
if let Some(proc_macro) = libproc_macro {
add_dep_with_prelude(
crate_graph,
crate_id,
CrateName::new("proc_macro").unwrap(),
proc_macro,
cargo[tgt].is_proc_macro,
);
}

// Add dependencies on core / std / alloc for this crate
public_deps.add(crate_id, crate_graph);
rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id);
Expand Down

0 comments on commit b429df2

Please sign in to comment.