user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy: Fix false positives with absolute repo paths in pal.rs check()

Browse source 
Fixes the bug:
1. git clone https://github.com/rust-lang/rust.git rust-improve-tests
2. cd rust-improve-tests
3. ./x test tidy

Expected:
No tidy errors found

Actual:
```
thread 'pal (library)' (837175) panicked at src/tools/tidy/src/pal.rs💯5:
assertion failed: saw_target_arch
```

Since the git checkout dir contains the word "tests", the `pal.rs`
`check()` used to erroneously ignore all paths.
This commit is contained in:
Martin Nordholts 2025-11-03 19:29:36 +01:00
parent f5711a55f5
commit 97e69d13e1
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tools/tidy/src/pal.rs
View file

@ -68,14 +68,20 @@ const EXCEPTION_PATHS: &[&str] = &[
"library/std/src/io/error.rs", // Repr unpacked needed for UEFI
];
pub fn check(path: &Path, tidy_ctx: TidyCtx) {
let mut check = tidy_ctx.start_check(CheckId::new("pal").path(path));
pub fn check(library_path: &Path, tidy_ctx: TidyCtx) {
let mut check = tidy_ctx.start_check(CheckId::new("pal").path(library_path));
let root_path = library_path.parent().unwrap();
// Let's double-check that this is the root path by making sure it has `x.py`.
assert!(root_path.join("x.py").is_file());
// Sanity check that the complex parsing here works.
let mut saw_target_arch = false;
let mut saw_cfg_bang = false;
walk(path, |path, _is_dir| filter_dirs(path), &mut |entry, contents| {
walk(library_path, |path, _is_dir| filter_dirs(path), &mut |entry, contents| {
let file = entry.path();
// We don't want the absolute path to matter, so make it relative.
let file = file.strip_prefix(root_path).unwrap();
let filestr = file.to_string_lossy().replace("\\", "/");
if !filestr.ends_with(".rs") {
return;