Rollup merge of #133492 - MarcoIeni:bootstrap-path-check, r=onur-ozkan

bootstrap: allow skipping steps with start of path
This commit is contained in:
Matthias Krüger 2024-11-29 10:18:57 +01:00 committed by GitHub
commit 95560d6fe7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -258,11 +258,11 @@ impl PathSet {
// internal use only
fn check(p: &TaskPath, needle: &Path, module: Kind) -> bool {
if let Some(p_kind) = &p.kind {
p.path.ends_with(needle) && *p_kind == module
} else {
p.path.ends_with(needle)
}
let check_path = || {
// This order is important for retro-compatibility, as `starts_with` was introduced later.
p.path.ends_with(needle) || p.path.starts_with(needle)
};
if let Some(p_kind) = &p.kind { check_path() && *p_kind == module } else { check_path() }
}
/// Return all `TaskPath`s in `Self` that contain any of the `needles`, removing the