Implement range support in `//@ edition`#146166

pvdrz · 2025-09-03T16:30:43Z

First step to solve #145364

fmease · 2025-09-03T16:57:59Z

r? fmease

rustbot · 2025-09-03T19:07:56Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

jieyouxu

Initial pass. I still need to think about the implication of this a bit.

View changes since this review

src/tools/compiletest/src/directives.rs

pvdrz · 2025-09-05T16:16:07Z

@jieyouxu this is ready for another review I think 🎉

src/tools/compiletest/src/directives.rs

src/tools/compiletest/src/directives/tests.rs

fmease · 2025-09-17T05:50:13Z

src/tools/compiletest/src/directives.rs

+    RangeFrom(Edition),
+    /// Half-open range: `[lower_bound, upper_bound)`
+    Range {
+        lower_bound: Edition,
+        upper_bound: Edition,
+    },


These could trivially be collapsed into Range { lower: Edition, upper: Option<Edition> } + using e.g., .map_or(true, inside edition_to_test but if you both find the current version more legible, I'm okay with it and won't block it.

src/tools/compiletest/src/directives.rs

fmease

Thanks!

Once https://github.com/rust-lang/rust/pull/146166/files#r2356501671 is addressed (unless it's too painful), this looks good to go to me :)

Ofc, I'll be waiting for Jieyou Xu's final ACK. Then r=fmease,jieyouxu (maybe after squash, idc)

View changes since this review

rustbot · 2025-10-02T16:13:44Z

This PR was rebased onto a different master 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.

fmease · 2025-10-02T16:39:58Z

@bors r=fmease,jieyouxu

bors · 2025-10-02T16:40:01Z

📌 Commit 6631c8e has been approved by fmease,jieyouxu

It is now in the queue for this repository.

bors · 2025-10-02T18:37:36Z

⌛ Testing commit 6631c8e with merge 409b4ea...

Implement range support in `//@ edition` First step to solve #145364

bors · 2025-10-02T20:41:35Z

💔 Test failed - checks-actions

fmease · 2025-10-02T22:55:36Z

Looking at the rich GHA logs of the failed job auto dist-x86_64-msvc-alt,

I see an abrupt end at line 10655 simply containing Compiling rustc-main v0.0.0 (D:\a\rust\rust\compiler\rustc), I can't scroll further down; when I scroll back up, I can only go till line 9661; nothing suspicious except some C++ compiler warnings.

I tried to view the raw logs but that failed with Failed to generate URL to download logs.; I tried to download log archive but the download failed after several MBs transmitted.

This gotta be spurious!

@bors retry

Rollup of 6 pull requests Successful merges: - #141839 (make rust-analyzer use a dedicated build directory) - #146166 (Implement range support in `//@ edition`) - #147259 (cg_llvm: Use helper methods for all calls to `LLVMMDNodeInContext2`) - #147263 (Disable triagebot auto stable-regression compiler backport nominations pending redesign) - #147268 (add arm-maintainers to various targets) - #147270 (Move doc_cfg-specific code into `cfg.rs`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146166 - ferrocene:pvdrz/edition-range, r=fmease,jieyouxu Implement range support in `//@ edition` First step to solve #145364

Zalathar · 2025-10-03T05:43:10Z

Bors hasn't noticed that this was merged.

@bors r-

Rollup of 6 pull requests Successful merges: - rust-lang/rust#141839 (make rust-analyzer use a dedicated build directory) - rust-lang/rust#146166 (Implement range support in `//@ edition`) - rust-lang/rust#147259 (cg_llvm: Use helper methods for all calls to `LLVMMDNodeInContext2`) - rust-lang/rust#147263 (Disable triagebot auto stable-regression compiler backport nominations pending redesign) - rust-lang/rust#147268 (add arm-maintainers to various targets) - rust-lang/rust#147270 (Move doc_cfg-specific code into `cfg.rs`) r? `@ghost` `@rustbot` modify labels: rollup

This comment has been minimized.

Sign in to view

pvdrz force-pushed the pvdrz/edition-range branch from a19047a to 714f2ca Compare September 3, 2025 16:48

rustbot assigned fmease Sep 3, 2025

pvdrz marked this pull request as ready for review September 3, 2025 19:07

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 Sep 3, 2025

jieyouxu self-assigned this Sep 3, 2025

jieyouxu reviewed Sep 5, 2025

View reviewed changes

pvdrz requested a review from jieyouxu September 16, 2025 16:42

fmease reviewed Sep 17, 2025

View reviewed changes

fmease 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 Sep 17, 2025

pvdrz requested a review from fmease September 17, 2025 17:03

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 Sep 17, 2025

fmease reviewed Sep 17, 2025

View reviewed changes

src/tools/compiletest/src/directives.rs Outdated Show resolved Hide resolved

fmease approved these changes Sep 18, 2025

View reviewed changes

fmease 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 Sep 18, 2025

pvdrz force-pushed the pvdrz/edition-range branch from 3dcbda0 to 6631c8e Compare October 2, 2025 16:13

pvdrz requested a review from fmease October 2, 2025 16:18

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 Oct 2, 2025

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 2, 2025

bors added a commit that referenced this pull request Oct 2, 2025

Auto merge of #146166 - ferrocene:pvdrz/edition-range, r=fmease,jieyouxu

409b4ea

Implement range support in `//@ edition` First step to solve #145364

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

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 2, 2025

Zalathar mentioned this pull request Oct 2, 2025

Rollup of 6 pull requests #147282

Merged

bors merged commit 6fe05b5 into rust-lang:master Oct 3, 2025
10 of 11 checks passed

rustbot added this to the 1.92.0 milestone Oct 3, 2025

rust-timer added a commit that referenced this pull request Oct 3, 2025

Unrolled build for #146166

4c6d6be

Rollup merge of #146166 - ferrocene:pvdrz/edition-range, r=fmease,jieyouxu Implement range support in `//@ edition` First step to solve #145364

Zalathar mentioned this pull request Oct 3, 2025

compiletest: Make DirectiveLine responsible for name/value splitting #147288

Merged

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 3, 2025

fmease mentioned this pull request Oct 3, 2025

Tracking issue for MCP 861: Make the UI test suite more amenable to multiple editions #145364

Open

5 tasks

tshepang mentioned this pull request Oct 3, 2025

reduce edition requirement for keyword test #147295

Closed

fmease mentioned this pull request Dec 2, 2025

Gate tests with the right edition #147498

Merged

Uh oh!

Conversation

pvdrz commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

fmease commented Sep 3, 2025

Uh oh!

rustbot commented Sep 3, 2025

Uh oh!

jieyouxu left a comment • 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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pvdrz commented Sep 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fmease Sep 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fmease left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Oct 2, 2025

Uh oh!

fmease commented Oct 2, 2025

Uh oh!

bors commented Oct 2, 2025

Uh oh!

bors commented Oct 2, 2025

Uh oh!

bors commented Oct 2, 2025

Uh oh!

fmease commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Zalathar commented Oct 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

pvdrz commented Sep 3, 2025 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading

fmease Sep 17, 2025 •

edited

Loading

fmease left a comment •

edited

Loading

fmease commented Oct 2, 2025 •

edited

Loading