Normalize .. and . in diagnostic file paths by arferreira · Pull Request #155569 · rust-lang/rust

arferreira · 2026-04-20T17:25:14Z

Lexically normalize . and .. in file paths when rendering diagnostics, so errors show foo.rs instead of sub/../foo.rs. Normalization is scoped to the new FileNameDisplayPreference::Diagnostics variant used by SourceMap::filename_for_diagnostics; file!(), debuginfo, and remapped/local/short paths are unchanged.

Uses the unstable Path::normalize_lexically, canonicalize is avoided because it turns relative paths absolute, which broke the previous attempt in #83345. Paths that normalize_lexically rejects (leading escapes, net-negative ..) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a $DIR/.. substitution so existing .stderr files that referenced auxiliary paths above $DIR keep matching.

Previous attempt was #68654.

r? @estebank

rustbot · 2026-04-20T17:25:17Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Urgau · 2026-08-13T16:04:10Z

@rustbot author

rustbot · 2026-08-13T16:04:15Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

rustbot · 2026-08-13T19:07:01Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

estebank · 2026-08-13T20:57:37Z

            FileNameDisplayPreference::Scope(scope) => self.path(scope).to_string_lossy(),
+            FileNameDisplayPreference::Diagnostics(scope) => {
+                let path = self.path(scope);
+                match path.normalize_lexically() {


My only concern with lexical normalization is that it doesn't hit the disk and one can craft a volume where ./foo/../bar.rs doesn't map to ./bar.rs. That seems convoluted though.

Could we add support for --verbose to print the path without normalization?

View changes since the review

If it's desirable, it would be possible to use something like same_file to test if both paths resolve to the same underlying file.

I don't think we can hit the disk here, these paths don't need to exist locally. --verbose should cover the cases where you'd want the raw path anyway.

ChrisDenton · 2026-08-13T23:35:43Z

I would note that normalize_lexically is still very much a new API and there's currently some debate as to how it should be shaped. However, it should always be possible to do what's needed here so I'm not too concerned. I'm just bringing up that it may require a bit of churn.

Signed-off-by: arferreira <arfs.antonio@gmail.com>

arferreira · 2026-08-14T12:26:28Z

@rustbot ready

estebank · 2026-09-01T19:28:20Z

@bors r+

rust-bors · 2026-09-01T19:28:22Z

📌 Commit 0da8bd3 has been approved by estebank

It is now in the queue for this repository.

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

Zalathar · 2026-09-02T13:26:05Z

Checking if this causes a failure seen in rollup in x86_64-mingw-1: #162184 (comment)

@bors try jobs=x86_64-mingw-1

Normalize .. and . in diagnostic file paths try-job: x86_64-mingw-1

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

rust-bors · 2026-09-02T15:28:49Z

💔 Test for a161d50 failed: CI. Failed job:

try - x86_64-mingw-1 (web logs, enhanced plaintext logs)

rustbot assigned estebank Apr 20, 2026

This comment has been minimized.

Sign in to view

arferreira force-pushed the normalize-diagnostic-paths branch from 72beb68 to e02a2f9 Compare April 20, 2026 17:46

Urgau reviewed Apr 20, 2026

View reviewed changes

Comment thread compiler/rustc_span/src/lib.rs Outdated

Comment thread compiler/rustc_span/src/lib.rs Outdated

arferreira force-pushed the normalize-diagnostic-paths branch 2 times, most recently from 7e7055d to b0cb45e Compare April 21, 2026 18:33

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2026

Normalize .. and . in diagnostic file paths

dea80f7

arferreira force-pushed the normalize-diagnostic-paths branch from b0cb45e to dea80f7 Compare August 13, 2026 19:06

estebank reviewed Aug 13, 2026

View reviewed changes

Print unnormalized diagnostic paths under --verbose

0da8bd3

Signed-off-by: arferreira <arfs.antonio@gmail.com>

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2026

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2026

Zalathar mentioned this pull request Sep 2, 2026

Rollup of 16 pull requests #162184

Closed

JonathanBrouwer mentioned this pull request Sep 2, 2026

Rollup of 16 pull requests #162186

Closed

Zalathar mentioned this pull request Sep 2, 2026

Rollup of 15 pull requests #162188

Closed

Zalathar mentioned this pull request Sep 2, 2026

Rollup of 18 pull requests #162189

Closed

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Sep 2, 2026

Auto merge of #155569 - arferreira:normalize-diagnostic-paths, r=<try>

a161d50

Normalize .. and . in diagnostic file paths try-job: x86_64-mingw-1

JonathanBrouwer mentioned this pull request Sep 2, 2026

Rollup of 20 pull requests #162198

Open

rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 2, 2026

Uh oh!

Uh oh!

Conversation

arferreira commented Apr 20, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 20, 2026

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

Urgau commented Aug 13, 2026

Uh oh!

rustbot commented Aug 13, 2026

Uh oh!

rustbot commented Aug 13, 2026

Uh oh!

estebank Aug 13, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ChrisDenton Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

arferreira Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

ChrisDenton commented Aug 13, 2026

Uh oh!

arferreira commented Aug 14, 2026

Uh oh!

estebank commented Sep 1, 2026

Uh oh!

rust-bors Bot commented Sep 1, 2026

Uh oh!

Zalathar commented Sep 2, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Sep 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

arferreira commented Apr 20, 2026 •

edited by rustbot

Loading

estebank Aug 13, 2026 •

edited by rustbot

Loading