nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-12 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #13342 - rust-lang:revert-13328-rustc-proc-macro, r=Veykril

Browse Source 
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
This commit is contained in:
bors 2022-10-04 06:18:57 +00:00
commit b429df2653
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/project-model/src/workspace.rs
View File

@ -717,7 +717,6 @@ fn cargo_to_crate_graph(
load_proc_macro, load_proc_macro,
&mut pkg_to_lib_crate, &mut pkg_to_lib_crate,
&public_deps, &public_deps,
libproc_macro,
cargo, cargo,
&pkg_crates, &pkg_crates,
build_scripts, build_scripts,
@ -783,7 +782,6 @@ fn handle_rustc_crates(
load_proc_macro: &mut dyn FnMut(&str, &AbsPath) -> ProcMacroLoadResult, load_proc_macro: &mut dyn FnMut(&str, &AbsPath) -> ProcMacroLoadResult,
pkg_to_lib_crate: &mut FxHashMap<Package, CrateId>, pkg_to_lib_crate: &mut FxHashMap<Package, CrateId>,
public_deps: &SysrootPublicDeps, public_deps: &SysrootPublicDeps,
libproc_macro: Option<CrateId>,
cargo: &CargoWorkspace, cargo: &CargoWorkspace,
pkg_crates: &FxHashMap<Package, Vec<(CrateId, TargetKind)>>, pkg_crates: &FxHashMap<Package, Vec<(CrateId, TargetKind)>>,
build_scripts: &WorkspaceBuildScripts, build_scripts: &WorkspaceBuildScripts,
@ -845,19 +843,6 @@ fn handle_rustc_crates(
rustc_workspace[tgt].is_proc_macro, rustc_workspace[tgt].is_proc_macro,
); );
pkg_to_lib_crate.insert(pkg, crate_id); 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 // Add dependencies on core / std / alloc for this crate
public_deps.add(crate_id, crate_graph); public_deps.add(crate_id, crate_graph);
rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id); rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id);