From a6960fb3b889c8c2ad41004f5294991a1da6d416 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 17 Nov 2020 11:31:40 +0100
Subject: [PATCH 1/3] simplify
---
crates/project_model/src/workspace.rs | 69 ++++++++++++---------------
1 file changed, 30 insertions(+), 39 deletions(-)
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 9ebb0a811b2..90ab5e7a952 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -70,12 +70,8 @@ impl ProjectWorkspace {
format!("Failed to deserialize json file {}", project_json.display())
})?;
let project_location = project_json.parent().unwrap().to_path_buf();
- let project = ProjectJson::new(&project_location, data);
- let sysroot = match &project.sysroot_src {
- Some(path) => Some(Sysroot::load(path)?),
- None => None,
- };
- ProjectWorkspace::Json { project, sysroot }
+ let project_json = ProjectJson::new(&project_location, data);
+ ProjectWorkspace::load_inline(project_json)?
}
ProjectManifest::CargoToml(cargo_toml) => {
let cargo_version = utf8_stdout({
@@ -150,43 +146,38 @@ impl ProjectWorkspace {
})
}))
.collect::<Vec<_>>(),
- ProjectWorkspace::Cargo { cargo, sysroot, rustc } => {
- let roots = cargo
- .packages()
- .map(|pkg| {
- let is_member = cargo[pkg].is_member;
- let pkg_root = cargo[pkg].root().to_path_buf();
+ ProjectWorkspace::Cargo { cargo, sysroot, rustc } => cargo
+ .packages()
+ .map(|pkg| {
+ let is_member = cargo[pkg].is_member;
+ let pkg_root = cargo[pkg].root().to_path_buf();
- let mut include = vec![pkg_root.clone()];
- include.extend(cargo[pkg].out_dir.clone());
+ let mut include = vec![pkg_root.clone()];
+ include.extend(cargo[pkg].out_dir.clone());
- let mut exclude = vec![pkg_root.join(".git")];
- if is_member {
- exclude.push(pkg_root.join("target"));
- } else {
- exclude.push(pkg_root.join("tests"));
- exclude.push(pkg_root.join("examples"));
- exclude.push(pkg_root.join("benches"));
- }
- PackageRoot { is_member, include, exclude }
- })
- .chain(sysroot.crates().map(|krate| PackageRoot {
+ let mut exclude = vec![pkg_root.join(".git")];
+ if is_member {
+ exclude.push(pkg_root.join("target"));
+ } else {
+ exclude.push(pkg_root.join("tests"));
+ exclude.push(pkg_root.join("examples"));
+ exclude.push(pkg_root.join("benches"));
+ }
+ PackageRoot { is_member, include, exclude }
+ })
+ .chain(sysroot.crates().map(|krate| PackageRoot {
+ is_member: false,
+ include: vec![sysroot[krate].root_dir().to_path_buf()],
+ exclude: Vec::new(),
+ }))
+ .chain(rustc.into_iter().flat_map(|rustc| {
+ rustc.packages().map(move |krate| PackageRoot {
is_member: false,
- include: vec![sysroot[krate].root_dir().to_path_buf()],
+ include: vec![rustc[krate].root().to_path_buf()],
exclude: Vec::new(),
- }));
- if let Some(rustc_packages) = rustc {
- roots
- .chain(rustc_packages.packages().map(|krate| PackageRoot {
- is_member: false,
- include: vec![rustc_packages[krate].root().to_path_buf()],
- exclude: Vec::new(),
- }))
- .collect()
- } else {
- roots.collect()
- }
- }
+ })
+ }))
+ .collect(),
}
}
From e4927d52e296c744b2c4bf7b42a10d019b9acff7 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 17 Nov 2020 11:50:54 +0100
Subject: [PATCH 2/3] Compress code
---
crates/base_db/src/input.rs | 20 +++++-
crates/project_model/src/workspace.rs | 88 ++++++++-------------------
2 files changed, 42 insertions(+), 66 deletions(-)
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index 31907ed9802..98ba372ad8d 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -225,7 +225,10 @@ impl CrateGraph {
to: CrateId,
) -> Result<(), CyclicDependenciesError> {
if self.dfs_find(from, to, &mut FxHashSet::default()) {
- return Err(CyclicDependenciesError);
+ return Err(CyclicDependenciesError {
+ from: (from, self[from].display_name.clone()),
+ to: (to, self[to].display_name.clone()),
+ });
}
self.arena.get_mut(&from).unwrap().add_dep(name, to);
Ok(())
@@ -421,7 +424,20 @@ impl fmt::Display for ParseEditionError {
impl std::error::Error for ParseEditionError {}
#[derive(Debug)]
-pub struct CyclicDependenciesError;
+pub struct CyclicDependenciesError {
+ from: (CrateId, Option<CrateDisplayName>),
+ to: (CrateId, Option<CrateDisplayName>),
+}
+
+impl fmt::Display for CyclicDependenciesError {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ let render = |(id, name): &(CrateId, Option<CrateDisplayName>)| match name {
+ Some(it) => format!("{}({:?})", it, id),
+ None => format!("{:?}", id),
+ };
+ write!(f, "cyclic deps: {} -> {}", render(&self.from), render(&self.to))
+ }
+}
#[cfg(test)]
mod tests {
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 90ab5e7a952..dbf1dc5bfac 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -12,8 +12,8 @@ use proc_macro_api::ProcMacroClient;
use rustc_hash::{FxHashMap, FxHashSet};
use crate::{
- cargo_workspace, cfg_flag::CfgFlag, utf8_stdout, CargoConfig, CargoWorkspace, ProjectJson,
- ProjectManifest, Sysroot, TargetKind,
+ cargo_workspace, cfg_flag::CfgFlag, sysroot::SysrootCrate, utf8_stdout, CargoConfig,
+ CargoWorkspace, ProjectJson, ProjectManifest, Sysroot, TargetKind,
};
/// `PackageRoot` describes a package root folder.
@@ -249,18 +249,14 @@ impl ProjectWorkspace {
if let Some(&from) = crates.get(&from) {
if let Some((public_deps, _proc_macro)) = &sysroot_dps {
for (name, to) in public_deps.iter() {
- if let Err(_) = crate_graph.add_dep(from, name.clone(), *to) {
- log::error!("cyclic dependency on {} for {:?}", name, from)
- }
+ add_dep(&mut crate_graph, from, name.clone(), *to)
}
}
for dep in &krate.deps {
let to_crate_id = dep.crate_id;
if let Some(&to) = crates.get(&to_crate_id) {
- if let Err(_) = crate_graph.add_dep(from, dep.name.clone(), to) {
- log::error!("cyclic dependency {:?} -> {:?}", from, to);
- }
+ add_dep(&mut crate_graph, from, dep.name.clone(), to)
}
}
}
@@ -299,16 +295,12 @@ impl ProjectWorkspace {
}
if cargo[tgt].is_proc_macro {
if let Some(proc_macro) = libproc_macro {
- if let Err(_) = crate_graph.add_dep(
+ add_dep(
+ &mut crate_graph,
crate_id,
CrateName::new("proc_macro").unwrap(),
proc_macro,
- ) {
- log::error!(
- "cyclic dependency on proc_macro for {}",
- &cargo[pkg].name
- )
- }
+ );
}
}
@@ -323,21 +315,12 @@ impl ProjectWorkspace {
// cargo metadata does not do any normalization,
// so we do it ourselves currently
let name = CrateName::normalize_dashes(&name);
- if to != from && crate_graph.add_dep(from, name, to).is_err() {
- log::error!(
- "cyclic dependency between targets of {}",
- &cargo[pkg].name
- )
+ if to != from {
+ add_dep(&mut crate_graph, from, name, to);
}
}
for (name, krate) in public_deps.iter() {
- if let Err(_) = crate_graph.add_dep(from, name.clone(), *krate) {
- log::error!(
- "cyclic dependency on {} for {}",
- name,
- &cargo[pkg].name
- )
- }
+ add_dep(&mut crate_graph, from, name.clone(), *krate);
}
}
}
@@ -349,13 +332,7 @@ impl ProjectWorkspace {
let name = CrateName::new(&dep.name).unwrap();
if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
for &from in pkg_crates.get(&pkg).into_iter().flatten() {
- if let Err(_) = crate_graph.add_dep(from, name.clone(), to) {
- log::error!(
- "cyclic dependency {} -> {}",
- &cargo[pkg].name,
- &cargo[dep.pkg].name
- )
- }
+ add_dep(&mut crate_graph, from, name.clone(), to)
}
}
}
@@ -391,15 +368,7 @@ impl ProjectWorkspace {
pkg_to_lib_crate.insert(pkg, crate_id);
// Add dependencies on the core / std / alloc for rustc
for (name, krate) in public_deps.iter() {
- if let Err(_) =
- crate_graph.add_dep(crate_id, name.clone(), *krate)
- {
- log::error!(
- "cyclic dependency on {} for {}",
- name,
- &cargo[pkg].name
- )
- }
+ add_dep(&mut crate_graph, crate_id, name.clone(), *krate);
}
rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id);
}
@@ -412,13 +381,7 @@ impl ProjectWorkspace {
let name = CrateName::new(&dep.name).unwrap();
if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
for &from in rustc_pkg_crates.get(&pkg).into_iter().flatten() {
- if let Err(_) = crate_graph.add_dep(from, name.clone(), to) {
- log::error!(
- "cyclic dependency {} -> {}",
- &rustc_workspace[pkg].name,
- &rustc_workspace[dep.pkg].name
- )
- }
+ add_dep(&mut crate_graph, from, name.clone(), to);
}
}
}
@@ -434,13 +397,7 @@ impl ProjectWorkspace {
continue;
}
for &from in pkg_crates.get(&pkg).into_iter().flatten() {
- if let Err(_) = crate_graph.add_dep(from, name.clone(), to) {
- log::error!(
- "cyclic dependency {} -> {}",
- &cargo[pkg].name,
- &rustc_workspace[dep].name
- )
- }
+ add_dep(&mut crate_graph, from, name.clone(), to);
}
}
}
@@ -511,19 +468,18 @@ fn sysroot_to_crate_graph(
) -> (Vec<(CrateName, CrateId)>, Option<CrateId>) {
let mut cfg_options = CfgOptions::default();
cfg_options.extend(get_rustc_cfg_options(target));
- let sysroot_crates: FxHashMap<_, _> = sysroot
+ let sysroot_crates: FxHashMap<SysrootCrate, CrateId> = sysroot
.crates()
.filter_map(|krate| {
let file_id = load(&sysroot[krate].root)?;
let env = Env::default();
let proc_macro = vec![];
- let name = CrateName::new(&sysroot[krate].name)
- .expect("Sysroot crates' names do not contain dashes");
+ let display_name = CrateDisplayName::from_canonical_name(sysroot[krate].name.clone());
let crate_id = crate_graph.add_crate_root(
file_id,
Edition::Edition2018,
- Some(name.into()),
+ Some(display_name),
cfg_options.clone(),
env,
proc_macro,
@@ -536,9 +492,7 @@ fn sysroot_to_crate_graph(
for &to in sysroot[from].deps.iter() {
let name = CrateName::new(&sysroot[to].name).unwrap();
if let (Some(&from), Some(&to)) = (sysroot_crates.get(&from), sysroot_crates.get(&to)) {
- if let Err(_) = crate_graph.add_dep(from, name, to) {
- log::error!("cyclic dependency between sysroot crates")
- }
+ add_dep(crate_graph, from, name, to);
}
}
}
@@ -579,3 +533,9 @@ fn get_rustc_cfg_options(target: Option<&str>) -> Vec<CfgFlag> {
res
}
+
+fn add_dep(graph: &mut CrateGraph, from: CrateId, name: CrateName, to: CrateId) {
+ if let Err(err) = graph.add_dep(from, name, to) {
+ log::error!("{}", err)
+ }
+}
From 0dc1742187d36b559d5d62ada3989901fdbd074c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 17 Nov 2020 11:51:45 +0100
Subject: [PATCH 3/3] Remove needless alloc
---
crates/project_model/src/sysroot.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs
index b0e8863f6a9..f0a43eaf6b8 100644
--- a/crates/project_model/src/sysroot.rs
+++ b/crates/project_model/src/sysroot.rs
@@ -37,7 +37,7 @@ impl Sysroot {
pub fn public_deps(&self) -> impl Iterator<Item = (&'static str, SysrootCrate)> + '_ {
// core is added as a dependency before std in order to
// mimic rustcs dependency order
- vec!["core", "alloc", "std"].into_iter().filter_map(move |it| Some((it, self.by_name(it)?)))
+ ["core", "alloc", "std"].iter().filter_map(move |&it| Some((it, self.by_name(it)?)))
}
pub fn proc_macro(&self) -> Option<SysrootCrate> {