Cleanup rust-src remapping and real dir
#142318
Merged
Conversation
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
|
|
rustbot
added
A-compiletest
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
This comment has been minimized.
This comment has been minimized.
Urgau
force-pushed
the
cleanup-rust-src-remap
branch
from
3679077 to
1861535
Compare
Urgau
force-pushed
the
cleanup-rust-src-remap
branch
from
1861535 to
208f2e4
Compare
jieyouxu
approved these changes
Jun 11, 2025
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
jieyouxu
added
S-waiting-on-review
bors
added a commit
that referenced
this pull request
Jun 12, 2025
Rollup of 10 pull requests Successful merges: - #141307 (Add method to retrieve body of closure in stable-mir) - #142040 (transmutability: shift abstraction boundary) - #142066 (More simple 2015 edition test decoupling) - #142157 (rustc_resolve: Improve `resolve_const_param_in_non_trivial_anon_const` wording) - #142217 (`tests/ui`: A New Order [10/N]) - #142219 (`tests/ui`: A New Order [11/N]) - #142261 (use correct edition when warning for unsafe attributes) - #142303 (Assorted bootstrap cleanups (step 1)) - #142318 (Cleanup `rust-src` remapping and real dir) - #142352 (compiler: Make `c_int_width` an integer) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 12, 2025
Rollup merge of #142318 - Urgau:cleanup-rust-src-remap, r=jieyouxu Cleanup `rust-src` remapping and real dir When remapping, `bootstrap` sets `CFG_VIRTUAL_RUST_SOURCE_BASE_DIR` to indicate what the base build dir (`/` of this repo) was remapped to, ie. `/rustc/...`. It is therefore impossible when stripping `/rustc/...` from a remapped path to be inside the our `library/` directory, nevertheless we have code that assumed it was possible and helpfully tried to correct it. I don't why this was done, but it's not necessary. ~~The normalization in compiletest of `$SRC_DIR_REAL` was also slightly wrong, it ate the `library` part for no reason.~~ EDIT: there is a reason, it affects too much tests otherwise r? `@jieyouxu`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When remapping,
bootstrapsetsCFG_VIRTUAL_RUST_SOURCE_BASE_DIRto indicate what the base build dir (/of this repo) was remapped to, ie./rustc/....It is therefore impossible when stripping
/rustc/...from a remapped path to be inside the ourlibrary/directory, nevertheless we have code that assumed it was possible and helpfully tried to correct it. I don't why this was done, but it's not necessary.The normalization in compiletest ofEDIT: there is a reason, it affects too much tests otherwise$SRC_DIR_REALwas also slightly wrong, it ate thelibrarypart for no reason.r? @jieyouxu