diff options
| author | bors <bors@rust-lang.org> | 2022-10-04 06:18:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-04 06:18:57 +0000 |
| commit | b429df2653bd209e27619cebe1f6ce6a5477142a (patch) | |
| tree | 87af0512b81e2e8c8984970ea001c596456fd4b2 | |
| parent | 974caaff8fa76fdf41e990ce3754b39bd2db5a50 (diff) | |
| parent | e0c9e28d1fab830d410872944a422ec692e51a68 (diff) | |
| download | rust-b429df2653bd209e27619cebe1f6ce6a5477142a.tar.gz rust-b429df2653bd209e27619cebe1f6ce6a5477142a.zip | |
Auto merge of #13342 - rust-lang:revert-13328-rustc-proc-macro, r=Veykril
Revert "Add proc-macro dependency to rustc crates" 1. This panics since it indexes into the wrong thing, so fixes https://github.com/rust-lang/rust-analyzer/issues/13340 2. This didn't fix what I thought it would either Reverts rust-lang/rust-analyzer#13328
| -rw-r--r-- | crates/project-model/src/workspace.rs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs index 8c3e8681d98..72ddf809288 100644 --- a/crates/project-model/src/workspace.rs +++ b/crates/project-model/src/workspace.rs @@ -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, @@ -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, @@ -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); |