itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extracted loop over ancestor paths when searching for a workspace root to its own function

Browse Source
This commit is contained in:
scott 2022-04-04 15:06:52 -05:00
parent b127a4c894
commit 035cb09f05
1 changed files with 82 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/cargo/core/workspace.rs
View File

@ -615,43 +615,33 @@ impl<'cfg> Workspace<'cfg> {
} }
} }
for path in paths::ancestors(manifest_path, None).skip(2) { find_root_iter(manifest_path, self.config)
if path.ends_with("target/package") { .find_map(|ances_manifest_path| {
break; debug!("find_root - trying {}", ances_manifest_path.display());
} let manifest = self.packages.load(&ances_manifest_path);
match manifest {
let ances_manifest_path = path.join("Cargo.toml"); Ok(manifest) => match *manifest.workspace_config() {
debug!("find_root - trying {}", ances_manifest_path.display()); WorkspaceConfig::Root(ref ances_root_config) => {
if ances_manifest_path.exists() { debug!("find_root - found a root checking exclusion");
match *self.packages.load(&ances_manifest_path)?.workspace_config() { if !ances_root_config.is_excluded(manifest_path) {
WorkspaceConfig::Root(ref ances_root_config) => { debug!("find_root - found!");
debug!("find_root - found a root checking exclusion"); Some(Ok(ances_manifest_path))
if !ances_root_config.is_excluded(manifest_path) { } else {
debug!("find_root - found!"); None
return Ok(Some(ances_manifest_path)); }
} }
} WorkspaceConfig::Member {
WorkspaceConfig::Member { root: Some(ref path_to_root),
root: Some(ref path_to_root), } => {
} => { debug!("find_root - found pointer");
debug!("find_root - found pointer"); Some(Ok(read_root_pointer(&ances_manifest_path, path_to_root)))
return Ok(Some(read_root_pointer(&ances_manifest_path, path_to_root))); }
} WorkspaceConfig::Member { .. } => None,
WorkspaceConfig::Member { .. } => {} },
Err(e) => Some(Err(e)),
} }
} })
.transpose()
// Don't walk across `CARGO_HOME` when we're looking for the
// workspace root. Sometimes a package will be organized with
// `CARGO_HOME` pointing inside of the workspace root or in the
// current package, but we don't want to mistakenly try to put
// crates.io crates into the workspace by accident.
if self.config.home() == path {
break;
}
}
Ok(None)
} }
/// After the root of a workspace has been located, probes for all members /// After the root of a workspace has been located, probes for all members
@ -1841,3 +1831,60 @@ impl InheritableFields {
}) })
} }
} }
pub fn find_root_iter<'a>(
manifest_path: &'a Path,
config: &'a Config,
) -> impl Iterator<Item = PathBuf> + 'a {
LookBehind::new(paths::ancestors(manifest_path, None).skip(2))
.into_iter()
.take_while(|path| !path.curr.ends_with("target/package"))
// Don't walk across `CARGO_HOME` when we're looking for the
// workspace root. Sometimes a package will be organized with
// `CARGO_HOME` pointing inside of the workspace root or in the
// current package, but we don't want to mistakenly try to put
// crates.io crates into the workspace by accident.
.take_while(|path| {
if let Some(last) = path.last {
config.home() != last
} else {
true
}
})
.map(|path| path.curr.join("Cargo.toml"))
.filter(|ances_manifest_path| ances_manifest_path.exists())
}
struct LookBehindWindow<'a, T: ?Sized> {
curr: &'a T,
last: Option<&'a T>,
}
struct LookBehind<'a, T: ?Sized, K: Iterator<Item = &'a T>> {
iter: K,
last: Option<&'a T>,
}
impl<'a, T: ?Sized, K: Iterator<Item = &'a T>> LookBehind<'a, T, K> {
fn new(items: K) -> Self {
Self {
iter: items,
last: None,
}
}
}
impl<'a, T: ?Sized, K: Iterator<Item = &'a T>> Iterator for LookBehind<'a, T, K> {
type Item = LookBehindWindow<'a, T>;
fn next(&mut self) -> Option<Self::Item> {
match self.iter.next() {
None => None,
Some(next) => {
let last = self.last;
self.last = Some(next);
Some(LookBehindWindow { curr: next, last })
}
}
}
}