Canonicalize path when displaying a FileName::Real - #68654
Closed
LeSeulArtichaut wants to merge 3 commits into
Closed
Canonicalize path when displaying a FileName::Real#68654LeSeulArtichaut wants to merge 3 commits into
FileName::Real#68654LeSeulArtichaut wants to merge 3 commits into
Conversation
rust-highfive
added
the
S-waiting-on-review
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
|
What effect does this PR have on windows systems? |
Contributor
Author
|
@estebank I couldn’t test this, as I haven’t got a Windows device myself |
LeSeulArtichaut
force-pushed
the
canonicalize-path-in-error
branch
from
February 2, 2020 22:31
87d3774 to
2c67a66
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Member
|
Could you please canonicalize when creating the |
LeSeulArtichaut
force-pushed
the
canonicalize-path-in-error
branch
from
February 11, 2020 20:49
b0947bb to
b13b60f
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
JohnCSimon
added
S-waiting-on-author
|
Ping from triage: @LeSeulArtichaut can you please address the check failures? Thank you. |
LeSeulArtichaut
force-pushed
the
canonicalize-path-in-error
branch
2 times, most recently
from
February 16, 2020 11:09
c016e98 to
e208404
Compare
Contributor
Author
|
@JohnCSimon Done! |
rustbot
added
S-waiting-on-review
bjorn3
reviewed
Feb 16, 2020
LeSeulArtichaut
force-pushed
the
canonicalize-path-in-error
branch
from
February 16, 2020 12:05
e208404 to
ffcb348
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
LeSeulArtichaut
force-pushed
the
canonicalize-path-in-error
branch
from
February 16, 2020 13:37
ffcb348 to
b7d992b
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
Author
Contributor
|
I think you'd need to modify |
JohnCSimon
removed
the
S-waiting-on-review
JohnCSimon
added
the
S-waiting-on-author
|
ping from triage: |
Collaborator
|
☔ The latest upstream changes (presumably #66364) made this pull request unmergeable. Please resolve the merge conflicts. |
JohnCSimon
added
the
S-inactive
|
@LeSeulArtichaut closing this as inactive because it hasn't been moved in a month. Please reopen when you're ready to continue with this. |
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 2, 2026
…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
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Sep 2, 2026
…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
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 2, 2026
…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
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 2, 2026
…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
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Sep 2, 2026
…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
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
7 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.
Addresses #51349 (?)
I'm also not sure if failing to canonicalize the path should result in failing to display the
FileName, or if the original path should be used as a fallback. My current implementation uses the latter, as it seemed the "wisest" solution to me.r? @estebank