language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reduce OUT_DIR special casing

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-10 12:08:35 +02:00
parent 560b98bc50
commit 27ebe5d33e
3 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ra_project_model/src/lib.rs
View file

@ -47,17 +47,21 @@ pub struct PackageRoot {
path: PathBuf,
/// Is a member of the current workspace
is_member: bool,
out_dir: Option<PathBuf>,
}
impl PackageRoot {
pub fn new_member(path: PathBuf) -> PackageRoot {
Self { path, is_member: true }
Self { path, is_member: true, out_dir: None }
}
pub fn new_non_member(path: PathBuf) -> PackageRoot {
Self { path, is_member: false }
Self { path, is_member: false, out_dir: None }
}
pub fn path(&self) -> &Path {
&self.path
}
pub fn out_dir(&self) -> Option<&Path> {
self.out_dir.as_deref()
}
pub fn is_member(&self) -> bool {
self.is_member
}
@ -204,6 +208,7 @@ impl ProjectWorkspace {
.map(|pkg| PackageRoot {
path: cargo[pkg].root().to_path_buf(),
is_member: cargo[pkg].is_member,
out_dir: cargo[pkg].out_dir.clone(),
})
.chain(sysroot.crates().map(|krate| {
PackageRoot::new_non_member(sysroot[krate].root_dir().to_path_buf())
@ -212,17 +217,6 @@ impl ProjectWorkspace {
}
}
pub fn out_dirs(&self) -> Vec<PathBuf> {
match self {
ProjectWorkspace::Json { project } => {
project.crates.iter().filter_map(|krate| krate.out_dir.as_ref()).cloned().collect()
}
ProjectWorkspace::Cargo { cargo, sysroot: _ } => {
cargo.packages().filter_map(|pkg| cargo[pkg].out_dir.as_ref()).cloned().collect()
}
}
}
pub fn proc_macro_dylib_paths(&self) -> Vec<PathBuf> {
match self {
ProjectWorkspace::Json { project } => project