From f2f3c554af2c4a698e0ceb087ceb4dfa6f95ee90 Mon Sep 17 00:00:00 2001 From: veetaha Date: Tue, 2 Jun 2020 23:15:23 +0300 Subject: Don't exclude dirs that appear in project root parent path --- xtask/tests/tidy.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index 4ac5d929f..62626064e 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs @@ -180,13 +180,11 @@ impl TidyDocs { } fn is_exclude_dir(p: &Path, dirs_to_exclude: &[&str]) -> bool { - let mut cur_path = p; - while let Some(path) = cur_path.parent() { - if dirs_to_exclude.iter().any(|dir| path.ends_with(dir)) { - return true; - } - cur_path = path; - } - - false + p.strip_prefix(project_root()) + .unwrap() + .components() + .rev() + .skip(1) + .filter_map(|it| it.as_os_str().to_str()) + .any(|it| dirs_to_exclude.contains(&it)) } -- cgit v1.2.3