mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal: improve consistency

Browse Source 
load and load_proc_macro do similar things
This commit is contained in:
Aleksey Kladov 2021-08-22 13:15:18 +03:00
parent 8cd171cd94
commit 5cef007bff
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/project_model/src/workspace.rs
View File

@ -354,7 +354,7 @@ pub fn to_crate_graph(
load: &mut dyn FnMut(&AbsPath) -> Option<FileId>, load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
) -> CrateGraph { ) -> CrateGraph {
let _p = profile::span("ProjectWorkspace::to_crate_graph"); let _p = profile::span("ProjectWorkspace::to_crate_graph");
let proc_macro_loader = |path: &AbsPath| match proc_macro_client { let proc_macro_loader = &mut |path: &AbsPath| match proc_macro_client {
Some(client) => client.by_dylib_path(path), Some(client) => client.by_dylib_path(path),
None => Vec::new(), None => Vec::new(),
}; };
@ -362,7 +362,7 @@ pub fn to_crate_graph(
let mut crate_graph = match self { let mut crate_graph = match self {
ProjectWorkspace::Json { project, sysroot, rustc_cfg } => project_json_to_crate_graph( ProjectWorkspace::Json { project, sysroot, rustc_cfg } => project_json_to_crate_graph(
rustc_cfg.clone(), rustc_cfg.clone(),
&proc_macro_loader, proc_macro_loader,
load, load,
project, project,
sysroot, sysroot,
@ -377,7 +377,7 @@ pub fn to_crate_graph(
} => cargo_to_crate_graph( } => cargo_to_crate_graph(
rustc_cfg.clone(), rustc_cfg.clone(),
cfg_overrides, cfg_overrides,
&proc_macro_loader, proc_macro_loader,
load, load,
cargo, cargo,
build_scripts, build_scripts,
@ -399,7 +399,7 @@ pub fn to_crate_graph(
fn project_json_to_crate_graph( fn project_json_to_crate_graph(
rustc_cfg: Vec<CfgFlag>, rustc_cfg: Vec<CfgFlag>,
proc_macro_loader: &dyn Fn(&AbsPath) -> Vec<ProcMacro>, proc_macro_loader: &mut dyn FnMut(&AbsPath) -> Vec<ProcMacro>,
load: &mut dyn FnMut(&AbsPath) -> Option<FileId>, load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
project: &ProjectJson, project: &ProjectJson,
sysroot: &Option<Sysroot>, sysroot: &Option<Sysroot>,
@ -476,7 +476,7 @@ fn project_json_to_crate_graph(
fn cargo_to_crate_graph( fn cargo_to_crate_graph(
rustc_cfg: Vec<CfgFlag>, rustc_cfg: Vec<CfgFlag>,
override_cfg: &CfgOverrides, override_cfg: &CfgOverrides,
proc_macro_loader: &dyn Fn(&AbsPath) -> Vec<ProcMacro>, proc_macro_loader: &mut dyn FnMut(&AbsPath) -> Vec<ProcMacro>,
load: &mut dyn FnMut(&AbsPath) -> Option<FileId>, load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
cargo: &CargoWorkspace, cargo: &CargoWorkspace,
build_scripts: &WorkspaceBuildScripts, build_scripts: &WorkspaceBuildScripts,
@ -658,7 +658,7 @@ fn handle_rustc_crates(
load: &mut dyn FnMut(&AbsPath) -> Option<FileId>, load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
crate_graph: &mut CrateGraph, crate_graph: &mut CrateGraph,
cfg_options: &CfgOptions, cfg_options: &CfgOptions,
proc_macro_loader: &dyn Fn(&AbsPath) -> Vec<ProcMacro>, proc_macro_loader: &mut dyn FnMut(&AbsPath) -> Vec<ProcMacro>,
pkg_to_lib_crate: &mut FxHashMap<la_arena::Idx<crate::PackageData>, CrateId>, pkg_to_lib_crate: &mut FxHashMap<la_arena::Idx<crate::PackageData>, CrateId>,
public_deps: &[(CrateName, CrateId)], public_deps: &[(CrateName, CrateId)],
cargo: &CargoWorkspace, cargo: &CargoWorkspace,
@ -750,7 +750,7 @@ fn add_target_crate_root(
pkg: &PackageData, pkg: &PackageData,
build_data: Option<&BuildScriptOutput>, build_data: Option<&BuildScriptOutput>,
cfg_options: &CfgOptions, cfg_options: &CfgOptions,
proc_macro_loader: &dyn Fn(&AbsPath) -> Vec<ProcMacro>, proc_macro_loader: &mut dyn FnMut(&AbsPath) -> Vec<ProcMacro>,
file_id: FileId, file_id: FileId,
cargo_name: &str, cargo_name: &str,
) -> CrateId { ) -> CrateId {