Normalize .. and . in diagnostic file paths#155569
Open
arferreira wants to merge 1 commit intorust-lang:mainfrom
Open
Normalize .. and . in diagnostic file paths#155569arferreira wants to merge 1 commit intorust-lang:mainfrom
arferreira wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-compiletest
This comment has been minimized.
This comment has been minimized.
arferreira
force-pushed
the
normalize-diagnostic-paths
branch
from
72beb68 to
e02a2f9
Compare
Urgau
reviewed
Apr 20, 2026
Comment on lines
+504
to
+526
| /// Lexically normalizes a path by resolving `.` and `..` components without | ||
| /// touching the filesystem. Preserves whether the path is relative or absolute. | ||
| /// | ||
| /// Used for diagnostic display only. `Path::canonicalize` is intentionally avoided | ||
| /// because it turns relative paths into absolute ones (see #51349, #83345). | ||
| pub(crate) fn normalize_path(path: &Path) -> PathBuf { | ||
| let mut out = PathBuf::new(); | ||
| for component in path.components() { | ||
| match component { | ||
| Component::CurDir => {} | ||
| Component::ParentDir => match out.components().next_back() { | ||
| Some(Component::Normal(_)) => { | ||
| out.pop(); | ||
| } | ||
| Some(Component::RootDir) => {} | ||
| _ => out.push(component), | ||
| }, | ||
| _ => out.push(component), | ||
| } | ||
| } | ||
| if out.as_os_str().is_empty() { PathBuf::from(".") } else { out } | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
I think this method can be replaced by the unstable Path::normalize_lexically method.
Comment on lines
+564
to
+573
| fn maybe_normalize<'s>(&self, s: Cow<'s, str>) -> Cow<'s, str> { | ||
| if !matches!(self.display_pref, FileNameDisplayPreference::Diagnostics(_)) { | ||
| return s; | ||
| } | ||
| let path = Path::new(s.as_ref()); | ||
| if !path.components().any(|c| matches!(c, Component::ParentDir | Component::CurDir)) { | ||
| return s; | ||
| } | ||
| Cow::Owned(normalize_path(path).into_os_string().to_string_lossy().into_owned()) | ||
| } |
Member
There was a problem hiding this comment.
This logic seems better fitted in RealFileName::to_string_lossy.
Even better it seems to me that it would be simpler to just embedded it in the FileNameDisplayPreference::Diagnostics(scope) match arm.
arferreira
force-pushed
the
normalize-diagnostic-paths
branch
from
e02a2f9 to
7e7055d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #51349
Lexically normalize
.and..in file paths when rendering diagnostics, so errors showfoo.rsinstead ofsub/../foo.rs. Normalization is scoped to the newFileNameDisplayPreference::Diagnosticsvariant used bySourceMap::filename_for_diagnostics;file!(), debuginfo, and remapped/local/short paths are unchanged.Avoids
Path::canonicalizeto keep relative paths relative (see #83345 for context). Compiletest gains a$DIR/..substitution so existing.stderrfiles that referenced auxiliary paths above$DIRkeep matching.Previous attempt was #68654.
r? @estebank