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

address PR comments

Browse Source
This commit is contained in:
David Barsky 2023-03-29 15:29:32 -04:00
parent e5bfd7ef0a
commit 25c59b8e92
4 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/base-db/src/input.rs
View File

@ -17,7 +17,7 @@ use vfs::{file_set::FileSet, AbsPathBuf, AnchoredPath, FileId, VfsPath};
// Map from crate id to the name of the crate and path of the proc-macro. If the value is `None`,
// then the crate for the proc-macro hasn't been build yet as the build data is missing.
pub type ProcMacroPaths = FxHashMap<CrateId, Option<(Option<String>, AbsPathBuf)>>;
pub type ProcMacroPaths = FxHashMap<CrateId, Result<(Option<String>, AbsPathBuf), String>>;
pub type ProcMacros = FxHashMap<CrateId, ProcMacroLoadResult>;
/// Files are grouped into source roots. A source root is a directory on the

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

@ -691,7 +691,7 @@ fn project_json_to_crate_graph(
target_layout: TargetLayoutLoadResult,
) -> (CrateGraph, ProcMacroPaths) {
let mut crate_graph = CrateGraph::default();
let mut proc_macros = FxHashMap::default();
let mut proc_macros: ProcMacroPaths = FxHashMap::default();
let sysroot_deps = sysroot.as_ref().map(|sysroot| {
sysroot_to_crate_graph(
&mut crate_graph,
@ -743,13 +743,11 @@ fn project_json_to_crate_graph(
);
if krate.is_proc_macro {
if let Some(path) = krate.proc_macro_dylib_path.clone() {
proc_macros.insert(
crate_graph_crate_id,
Some((
krate.display_name.as_ref().map(|it| it.canonical_name().to_owned()),
path,
)),
);
let node = Ok((
krate.display_name.as_ref().map(|it| it.canonical_name().to_owned()),
path,
));
proc_macros.insert(crate_graph_crate_id, node);
}
}
(crate_id, crate_graph_crate_id)
@ -1193,8 +1191,8 @@ fn add_target_crate_root(
);
if is_proc_macro {
let proc_macro = match build_data.as_ref().map(|it| it.proc_macro_dylib_path.as_ref()) {
Some(it) => it.cloned().map(|path| Some((Some(cargo_name.to_owned()), path))),
None => Some(None),
Some(it) => it.cloned().map(|path| Ok((Some(cargo_name.to_owned()), path))),
None => Some(Err("crate has not yet been build".to_owned())),
};
if let Some(proc_macro) = proc_macro {
proc_macros.insert(crate_id, proc_macro);

2
crates/rust-analyzer/src/cli/load_cargo.rs
View File

@ -102,7 +102,7 @@ pub fn load_workspace(
(
crate_id,
path.map_or_else(
|| Err("proc macro crate is missing dylib".to_owned()),
|_| Err("proc macro crate is missing dylib".to_owned()),
|(_, path)| load_proc_macro(proc_macro_server, &path, &[]),
),
)

55
crates/rust-analyzer/src/reload.rs
View File

@ -251,7 +251,7 @@ impl GlobalState {
(
crate_id,
res.map_or_else(
|| Err("proc macro crate is missing dylib".to_owned()),
|_| Err("proc macro crate is missing dylib".to_owned()),
|(crate_name, path)| {
progress(path.display().to_string());
load_proc_macro(
@ -296,25 +296,11 @@ impl GlobalState {
let workspaces =
workspaces.iter().filter_map(|res| res.as_ref().ok().cloned()).collect::<Vec<_>>();
// `different_workspaces` is used to determine whether to spawn a a new proc macro server for
// a newly-added rust workspace (most commonly sourced from a `rust-project.json`). While the
// algorithm to find the new workspaces is quadratic, we generally expect that the number of total
// workspaces to remain in the low single digits. the `cloned_workspace` is needed for borrowck
// reasons.
let cloned_workspaces = workspaces.clone();
let different_workspaces = cloned_workspaces
.iter()
.filter(|ws| {
!self
.workspaces
.iter()
.find(|existing_ws| ws.eq_ignore_build_data(&existing_ws))
.is_some()
})
.collect::<Vec<_>>();
let same_workspaces = different_workspaces.is_empty();
tracing::debug!(current_workspaces = ?self.workspaces, new_workspaces = ?workspaces, ?same_workspaces, "comparing workspaces");
let same_workspaces = workspaces.len() == self.workspaces.len()
&& workspaces
.iter()
.zip(self.workspaces.iter())
.all(|(l, r)| l.eq_ignore_build_data(r));
if same_workspaces {
let (workspaces, build_scripts) = self.fetch_build_data_queue.last_op_result();
@ -384,7 +370,7 @@ impl GlobalState {
let files_config = self.config.files();
let project_folders = ProjectFolders::new(&self.workspaces, &files_config.exclude);
if self.proc_macro_clients.is_empty() || !different_workspaces.is_empty() {
if self.proc_macro_clients.is_empty() || !same_workspaces {
if let Some((path, path_manually_set)) = self.config.proc_macro_srv() {
tracing::info!("Spawning proc-macro servers");
self.proc_macro_clients = self
@ -462,31 +448,8 @@ impl GlobalState {
};
let mut change = Change::new();
// `self.fetch_proc_macros_queue.request_op(cause, proc_macro_paths)` is only called in
// when `switch_workspaces` is called _without_ changing workspaces. This typically occurs
// when build scripts have finishing building, but when rust-analyzer is used with a
// rust-project.json, the build scripts have already been built by the external build system
// that generated the `rust-project.json`.
// Therefore, in order to allow _new_ workspaces added via rust-project.json (e.g., after
// a workspace was already added), we check whether this is the same workspace _or_
// if any of the new workspaces is a `rust-project.json`.
//
// The else branch is used to provide better diagnostics to users while procedural macros
// are still being built.
if same_workspaces || different_workspaces.iter().any(|ws| ws.is_json()) {
if self.config.expand_proc_macros() {
self.fetch_proc_macros_queue.request_op(cause, proc_macro_paths);
}
} else {
// Set up errors for proc-macros upfront that we haven't run build scripts yet
let mut proc_macros = FxHashMap::default();
for paths in proc_macro_paths {
proc_macros.extend(paths.into_iter().map(move |(crate_id, _)| {
(crate_id, Err("crate has not yet been build".to_owned()))
}));
}
change.set_proc_macros(proc_macros);
if self.config.expand_proc_macros() {
self.fetch_proc_macros_queue.request_op(cause, proc_macro_paths);
}
change.set_crate_graph(crate_graph);
self.analysis_host.apply_change(change);