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

add extra include paths, if target's path is manually set in Cargo.toml to be

Browse Source
This commit is contained in:
rezural 2021-06-22 08:59:57 +10:00
parent 37dc2dfada
commit f55b1d1e19
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,6 +234,23 @@ impl ProjectWorkspace {
.and_then(|it| it.out_dir.clone()),
);
// In case target's path is manually set in Cargo.toml to be
// outside the package root, add its parent as an extra include.
// An example of this situation would look like this:
//
// ```toml
// [lib]
// path = "../../src/lib.rs"
// ```
let extra_targets = cargo[pkg]
.targets
.iter()
.filter(|&&tgt| cargo[tgt].kind == TargetKind::Lib)
.filter_map(|&tgt| cargo[tgt].root.parent())
.map(|tgt| tgt.normalize().to_path_buf())
.filter(|path| !path.starts_with(pkg_root.clone()));
include.extend(extra_targets);
let mut exclude = vec![pkg_root.join(".git")];
if is_member {
exclude.push(pkg_root.join("target"));