Skip to content

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Oct 1, 2025

Previously in the //-compiletest-directive times, no-remap-src-base was implemented as a special no-* directive parsing. In the migration from // -> //@, the // no-remap-src-base directive was lost, most likely because it had no effect -- the default is not remapping src-base.

So remove occurrences of no-remap-src-base, as these are not valid directives.

r? @Zalathar (since we discussed this on discord, or compiler)

Previously in the `//`-compiletest-directive times, this was implemented
as a special `no-*` directive parsing. In the migration from `//` ->
`//@`, the `// no-remap-src-base` directive was lost, most likely
because it had no effect -- the default is not remapping `src-base`.

So remove occurrences of `no-remap-src-base`, as these are not valid
directives.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 1, 2025
@Zalathar
Copy link
Contributor

Zalathar commented Oct 1, 2025

Also for historical context, #147170 is removing the code that would have been parsing the no-remap-src-base directive (parse_negative_name_directive).

@Zalathar
Copy link
Contributor

Zalathar commented Oct 1, 2025

Cool, r=me on green. 👍

@jieyouxu
Copy link
Member Author

jieyouxu commented Oct 1, 2025

CI is green
@bors r=Zalathar

@bors
Copy link
Collaborator

bors commented Oct 1, 2025

📌 Commit ec893d1 has been approved by Zalathar

It is now in the queue for this repository.

@bors bors 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 Oct 1, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented Oct 1, 2025

@bors rollup

bors added a commit that referenced this pull request Oct 1, 2025
Rollup of 11 pull requests

Successful merges:

 - #146918 (add regression test)
 - #146980 (simplify setup_constraining_predicates, and note it is potentially cubic)
 - #147170 (compiletest: Pass around `DirectiveLine` instead of bare strings)
 - #147180 (add tests)
 - #147188 (Remove usage of `compiletest-use-stage0-libtest` from CI)
 - #147189 (Replace `rustc_span::Span` with a stripped down version for librustdoc's highlighter)
 - #147199 (remove outdated comment in (inner) `InferCtxt`)
 - #147200 (Fix autodiff empty ret regression)
 - #147209 (Remove `no-remap-src-base` from tests)
 - #147213 (Fix broken STD build for ESP-IDF)
 - #147217 (Don't create a top-level `true` directory when running UI tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f50c76f into rust-lang:master Oct 1, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 1, 2025
rust-timer added a commit that referenced this pull request Oct 1, 2025
Rollup merge of #147209 - jieyouxu:remove-no-remap-src-base, r=Zalathar

Remove `no-remap-src-base` from tests

Previously in the `//`-compiletest-directive times, `no-remap-src-base` was implemented as a special `no-*` directive parsing. In the migration from `//` -> `//`@`,` the `// no-remap-src-base` directive was lost, most likely because it had no effect -- the default is not remapping `src-base`.

So remove occurrences of `no-remap-src-base`, as these are not valid directives.

r? `@Zalathar` (since we discussed this on discord, or compiler)
@jieyouxu jieyouxu deleted the remove-no-remap-src-base branch October 2, 2025 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants