Skip to content

bootstrap: Restrict the normalization of relative paths #161085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Aug 14, 2026
Merged

bootstrap: Restrict the normalization of relative paths #161085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 32 additions & 37 deletions src/bootstrap/src/core/builder/cli_paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use std::collections::{HashMap, HashSet};
use std::hash::Hash;
use std::path::PathBuf;
use std::path::{Path, PathBuf};

use crate::core::builder::{Builder, CommandLineStepDescription, Kind, PathSet, ShouldRun};
use crate::utils::helpers;
Expand Down Expand Up @@ -55,42 +55,8 @@ pub(crate) fn match_paths_to_steps_and_run(
}
}

// Command-line paths are interpreted relative to the repository root
// (not the current working directory).
//
// If the user or shell passed an absolute path, try to strip off the
// repository root, to match the paths registered by command-line steps.
//
// E.g. `/home/ferris/rust/tests/ui/asm/cfg.rs` => `tests/ui/asm/cfg.rs`
//
// It is also possible that someone passed a relative path starting with . or ..
// In that case, we have to remove that path prefix.
Comment on lines -66 to -67

@Zalathar Zalathar Aug 14, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, arguments beginning with ../ have never actually worked in recent memory.

View changes since the review

let paths = paths
.iter()
.map(|path| {
// Here we "launder" the path through builder.src, to normalize relative path prefixes
// so ./tests/foo becomes just tests/foo
let path = if path.is_relative() {
builder
.src
.join(path)
.strip_prefix(&builder.src)
.expect("Cannot strip src path prefix")
.to_path_buf()
} else {
path.to_path_buf()
};

if path.is_absolute()
&& path.exists()
&& let Ok(relative) = path.strip_prefix(&builder.src)
{
relative.to_path_buf()
} else {
path
}
})
.collect::<Vec<_>>();
// Normalize command-line selectors to account for absolute and dot-relative paths.
let paths = paths.iter().map(|path| normalize_selector(builder, path)).collect::<Vec<_>>();

// If any absolute paths couldn't be made relative, stop now and report them.
let bad_abs_paths = paths.iter().filter(|path| path.is_absolute()).collect::<Vec<_>>();
Expand Down Expand Up @@ -172,3 +138,32 @@ pub(crate) fn match_paths_to_steps_and_run(
step.desc.maybe_run(builder, anchors);
}
}

/// Normalize command-line arguments that happen to be paths, e.g.:
/// - `/home/ferris/rust/tests/ui/asm/cfg.rs` => `tests/ui/asm/cfg.rs`
/// - `./tests/ui/asm/cfg.rs` => `tests/ui/asm/cfg.rs`
///
/// Normalization is performed relative to the _repository source root_,
/// not the working directory.
///
/// We take care to only modify selectors that specifically resemble paths,
/// and to only modify selectors that actually correspond to a file on disk.
/// This avoids incorrect conversions such as:
/// - `/home/ferris/rust/ui` =X=> `ui`
/// - `./tidyselftest` =X=> `tidyselftest`
fn normalize_selector<'a>(builder: &Builder<'_>, path: &'a Path) -> &'a Path {
// Note that `Path::strip_prefix` strips path _segments_, not substrings.
// So this turns `./foo` into `foo`, but ignores `../foo` entirely.
if let Ok(without_dot) = Path::strip_prefix(path, ".")
&& builder.src.join(path).exists()
{
without_dot
} else if path.is_absolute()
&& path.exists()
&& let Ok(relative) = path.strip_prefix(&builder.src)
{
relative
} else {
path
}
}
Loading