Gate tests with the right edition by pvdrz · Pull Request #147498 · rust-lang/rust

pvdrz · 2025-10-08T21:29:42Z

This PR guarantees that ./x test --test-args="--edition XXXX" ui runs correctly with the 2015, 2018 and 2021 editions.

I don't expect this PR to hold up over time but it helps to submit further updates to the //@ edition directives of tests where we can use the new range syntax to have a more robust testing across different editions

r? @fmease

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: test-various
try-job: armhf-gnu

jieyouxu · 2025-10-09T00:20:19Z

I'll nominate this for compiler team discussion re. "we accepted the MCP for the direction in theory, here's the actual shape of the implementation" for a quick vibecheck. If team is onboard, we'll coordinate to bump the priority of this PR w.r.t. merge conflict potential.

fmease · 2025-10-09T00:42:31Z

If team is onboard, we'll coordinate to bump the priority of this PR w.r.t. merge conflict potential.

We can do so already proactively:

@bors rollup=never p=20 (bitrot-prone, prone to conflicts in the queue; ref)

jieyouxu · 2025-10-09T14:45:02Z

Discussed in today's compiler triage meeting #t-compiler/meetings > [weekly] 2025-10-09 @ 💬, no objections to current direction.

I'll set aside sometime this weekend and/or next weekend to do a review pass.

jieyouxu · 2025-10-10T11:59:06Z

@bors try

Gate tests with the right edition try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1 try-job: test-various try-job: armhf-gnu

rust-bors · 2025-10-10T13:28:15Z

💔 Test for 058257d failed: CI. Failed jobs:

try - aarch64-gnu (web logs, extended logs)

fmease · 2025-10-13T12:00:57Z

The root cause(s) of #147556 have been mitigated IIUC (by temporary means or why is it still open?). Thus I'll try again

@bors try

Gate tests with the right edition try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1 try-job: test-various try-job: armhf-gnu

rust-bors · 2025-10-13T15:08:19Z

☀️ Try build successful (CI)
Build commit: 7431b5f (7431b5f61bcdc70e1bf990a84b252dc96dbd4a60, parent: 35456985fab3419baf4bf111b8bbbd5e8565615d)

bors · 2025-10-19T04:55:01Z

☔ The latest upstream changes (presumably #147863) made this pull request unmergeable. Please resolve the merge conflicts.

fmease

I have one question I'd like to see answered I guess (namely #147498 (comment)), otherwise LGTM. I'm so sorry for the long wait!

View changes since this review

fmease · 2025-11-27T20:32:46Z

+ --> $DIR/resolve-conflict-extern-crate-vs-extern-crate.rs:2:1
+ |
+LL | extern crate std;
+ | ^^^^^^^^^^^^^^^^^ `std` reimported here


I'm very confused; why did the diagnostic emitter deem this span available now but not before? You only offset the crate declaration... seems fishy unless I'm missing something.

That's fishy indeed, if I move the edition annotation to the end of the file, this addition disappears.

fmease · 2025-11-27T21:46:03Z

@bors r=jieyouxu,fmease

bors · 2025-11-27T21:46:06Z

📌 Commit 7ae2823 has been approved by jieyouxu,fmease

It is now in the queue for this repository.

bors · 2025-11-27T22:37:10Z

⌛ Testing commit 7ae2823 with merge e6edf3a...

bors · 2025-11-28T01:52:14Z

☀️ Test successful - checks-actions
Approved by: jieyouxu,fmease
Pushing e6edf3a to main...

github-actions · 2025-11-28T01:55:06Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing c86564c (parent) -> e6edf3a (this PR)

Test differences

Show 33 test diffs

Stage 1

[ui] tests/ui/coroutine/async_gen_fn.rs#e2015: [missing] -> pass (J1)
[ui] tests/ui/coroutine/async_gen_fn.rs#mid: [missing] -> pass (J1)
[ui] tests/ui/coroutine/async_gen_fn.rs#none: pass -> [missing] (J1)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#e2015: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#middle: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#none: pass -> [missing] (J1)
[ui] tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs#edition2015: pass -> [missing] (J1)
[ui] tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs#pre2021: [missing] -> pass (J1)
[ui] tests/ui/imports/suggest-import-issue-120074.rs#edition2021: pass -> [missing] (J1)
[ui] tests/ui/imports/suggest-import-issue-120074.rs#post2015: [missing] -> pass (J1)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs: pass -> [missing] (J1)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2015: [missing] -> pass (J1)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2018: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/coroutine/async_gen_fn.rs#e2015: [missing] -> pass (J0)
[ui] tests/ui/coroutine/async_gen_fn.rs#mid: [missing] -> pass (J0)
[ui] tests/ui/coroutine/async_gen_fn.rs#none: pass -> [missing] (J0)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#e2015: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#middle: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-gen_blocks.rs#none: pass -> [missing] (J0)
[ui] tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs#edition2015: pass -> [missing] (J0)
[ui] tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs#pre2021: [missing] -> pass (J0)
[ui] tests/ui/imports/suggest-import-issue-120074.rs#edition2021: pass -> [missing] (J0)
[ui] tests/ui/imports/suggest-import-issue-120074.rs#post2015: [missing] -> pass (J0)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs: pass -> [missing] (J2)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2015: [missing] -> pass (J2)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2018: [missing] -> pass (J2)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs: ignore (gcc backend is marked as ignore) -> [missing] (J3)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2015: [missing] -> ignore (gcc backend is marked as ignore) (J3)
[ui] tests/ui/proc-macro/derive-helper-shadowing.rs#edition2018: [missing] -> ignore (gcc backend is marked as ignore) (J3)

Additionally, 4 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard e6edf3ae535d28b8331d5718d6e658e340af6f60 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-aarch64-apple: 7863.9s -> 6200.3s (-21.2%)
pr-check-1: 2026.8s -> 1664.5s (-17.9%)
aarch64-gnu: 7693.2s -> 6560.2s (-14.7%)
i686-gnu-2: 6075.9s -> 5285.0s (-13.0%)
dist-various-1: 3736.1s -> 4213.4s (+12.8%)
dist-x86_64-apple: 6872.9s -> 6037.4s (-12.2%)
x86_64-gnu-llvm-20: 2794.2s -> 2454.7s (-12.2%)
i686-gnu-1: 8149.4s -> 7322.2s (-10.1%)
x86_64-gnu-gcc: 3381.2s -> 3041.8s (-10.0%)
dist-apple-various: 4146.9s -> 3731.4s (-10.0%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-11-28T03:15:39Z

Finished benchmarking commit (e6edf3a): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (primary 2.1%, secondary 1.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	1.9%	[1.9%, 1.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 474.675s -> 472.955s (-0.36%)
Artifact size: 386.94 MiB -> 386.96 MiB (0.00%)

WaffleLapkin · 2025-12-02T09:59:24Z

Why is edition 2024 not handled? i.e. why all the ranges use 2015..2021 and not 2015..2024 or even 2015..?

Also yes, the range 2015..2021 basically means edition <= 2018 as we don't have ..=.

@pvdrz I don't think this is true, as per rustc dev guide:

A test with the //@ edition: 2015..2021 directive can be run under the 2015, 2018, and 2021 editions. However, CI will only run the test with the lowest edition in the range (which is 2015 in this example).

fmease · 2025-12-02T10:34:00Z

Why is edition 2024 not handled? i.e. why all the ranges use 2015..2021 and not 2015..2024 or even 2015..?

Because this is only one in a series of PRs (cc tracking issue: #145364). I'm sure this could be handled differently but this is all mostly mechanical (for now).

[@]pvdrz I don't think this is true, as per rustc dev guide:

Note that you're replying to the person who implemented this syntax, the docs are just wrong (sorry about that, I'll fix that ASAP).

fmease · 2025-12-02T11:04:31Z

For posterity, I did "argue" for ..= in the MCP topic (#t-compiler/major changes > Make the UI test suite more amenable to m… compiler-team#861 @ 💬) since I find that more intuitive in the context of editions but I didn't feel like bikeshedding it / bringing it up again in PR #146166, maybe I should've. I mean, nothing is set in stone, we can always mass-migrate to a different syntax or revert everything altogether.

I guess the rationale for .. over ..= is the fact that we'd like to have a range that isn't bounded on the right and $edition..= would look "odd" as it's not valid in Rust but maybe that's a weak argument. Re. why not both? Well, it would increase the complexity of this feature and make it harder to choose the right form as a test writer I suppose.

WaffleLapkin · 2025-12-02T17:25:24Z

I think having a..=b and a.. would be fine.

pvdrz · 2025-12-02T18:48:44Z

@WaffleLapkin thanks for the catch on the dev guide. It totally slipped through my head, but yes, the edition range is non-inclusive.

This comment was marked as resolved.
Sign in to view

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

rustbot assigned fmease Oct 8, 2025

This comment was marked as off-topic.
Sign in to view

This comment has been minimized.
Sign in to view

jieyouxu self-assigned this Oct 9, 2025

jieyouxu added the I-compiler-nominated Nominated for discussion during a compiler team meeting. label Oct 9, 2025

fmease added the S-waiting-on-t-compiler Status: Awaiting decision from T-compiler label Oct 9, 2025

fmease reviewed Oct 9, 2025
View reviewed changes

Comment threadtests/ui/asm/naked-invalid-attr.rs

jieyouxu removed I-compiler-nominated Nominated for discussion during a compiler team meeting. S-waiting-on-t-compiler Status: Awaiting decision from T-compiler labels Oct 9, 2025

pvdrz force-pushed the pvdrz/edition-range-gating branch from 5a3a9a0 to 6e1b054Compare October 9, 2025 23:01

This comment has been minimized.
Sign in to view

jieyouxu mentioned this pull request Oct 10, 2025
libffi build error on aarch64-gnu-debug: unsupported option '-print-multi-os-directory' #147556
Closed

This comment has been minimized.
Sign in to view

pvdrz mentioned this pull request Oct 14, 2025
Tracking issue for MCP 861: Make the UI test suite more amenable to multiple editions #145364
Open
5 tasks

pvdrz force-pushed the pvdrz/edition-range-gating branch from 6e1b054 to c6339eaCompare October 20, 2025 02:49

This comment has been minimized.
Sign in to view

pvdrz force-pushed the pvdrz/edition-range-gating branch from bfcce5f to 7ae2823Compare November 27, 2025 19:14

fmease approved these changes Nov 27, 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 Nov 27, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 28, 2025

bors merged commit e6edf3a into rust-lang:mainNov 28, 2025
12 checks passed

rustbot added this to the 1.93.0 milestone Nov 28, 2025

bors mentioned this pull request Nov 28, 2025
resolve: Partially convert ambiguous_glob_imports lint into a hard error #149195
Merged

tshepang deleted the pvdrz/edition-range-gating branch November 28, 2025 05:34

fmease mentioned this pull request Dec 2, 2025
Fix example which wrongly implied that the upper bound of edition ranges was inclusive rust-lang/rustc-dev-guide#2669
Merged

Uh oh!

Uh oh!

Conversation

pvdrz commented Oct 8, 2025• edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as off-topic.

This comment has been minimized.

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Oct 9, 2025

Uh oh!

jieyouxu commented Oct 10, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Oct 10, 2025

Uh oh!

fmease commented Oct 13, 2025

Uh oh!

This comment has been minimized.

rust-borsBot commented Oct 13, 2025

Uh oh!

bors commented Oct 19, 2025

Uh oh!

This comment has been minimized.

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!

fmeaseNov 27, 2025

Choose a reason for hiding this comment

Uh oh!

pvdrzNov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fmease commented Nov 27, 2025

Uh oh!

bors commented Nov 27, 2025

Uh oh!

bors commented Nov 27, 2025

Uh oh!

bors commented Nov 28, 2025

Uh oh!

Uh oh!

github-actionsBot commented Nov 28, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Nov 28, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

fmease commented Dec 2, 2025

Uh oh!

WaffleLapkin commented Dec 2, 2025

Uh oh!

pvdrz commented Dec 2, 2025

Uh oh!

Reviewers

Assignees

Labels

pvdrz commented Oct 8, 2025•
edited by jieyouxu
Loading

jieyouxu commented Oct 9, 2025•
edited
Loading

fmease commented Oct 9, 2025•
edited
Loading

fmease left a comment •
edited
Loading

WaffleLapkin commented Dec 2, 2025•
edited
Loading

fmease commented Dec 2, 2025•
edited
Loading