Apply path remapping to imported source files and update tests#151741
Closed
paradoxicalguy wants to merge 1 commit intorust-lang:mainfrom
Closed
Apply path remapping to imported source files and update tests#151741paradoxicalguy wants to merge 1 commit intorust-lang:mainfrom
paradoxicalguy wants to merge 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
r? @wesleywiser rustbot has assigned @wesleywiser. Use |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
@wesleywiser Currently the sysroot paths are now correctly remapped and i wanted to ask, should i update the failing test expectations as per the errors of this new behavior or would you suggest a different approach? eg scoping the fix to only sysroot files by checking for |
Contributor
|
☔ The latest upstream changes (presumably #151778) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
@workingjubilee will you be able to take hold of this pr and provide some guidance? |
Contributor
Author
Collaborator
|
|
Member
Contributor
Author
|
OH, this was directly opposing your changes 😭, sorry about that |
Contributor
|
Debian is on 1.92 atm, so it will be a while until I can report back |
Contributor
Author
|
i performed a test on Nightly to verify, waiting for debian side verification. |
Member
|
I don't think so. The issue in #74786 is that debian is using a different (custom) prefix for Rust sources, which we don't support in bootstrap, so some patching is required on their side, unless we decide to support custom remap prefix one day. |
Contributor
Author
|
i was chasing a ghost😭 |
Member
|
r? Urgau |
This comment was marked as off-topic.
This comment was marked as off-topic.
Contributor
Author
|
closing this PR, |
rustbot
removed
the
S-waiting-on-review
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.
Fixes issue #74786
this fix ensures that
new_imported_source_filerespects the--remap-path-prefixconfiguration.fix:
Changed
compiler/rustc_span/src/source_map.rsfile to interpret the filename beforeSourceFileis created.Now it:
RemapPathScopeComponents::DIAGNOSTICS.to_real_filename, ensuring consistent behavior.tests i ran:
./x.py test tests/ui --test-args remapwith--blessafter building compiler with std lib in WSL ubuntu.tests/ui/errors/*.stderrto reflect the correct remapped paths.tests/ui/errors/remap-path-prefix-reverse.rsto remove an error pattern check that relied on the bug.