Add edition checks for some tests that had divergent output #142255

estebank · 2025-06-09T17:53:42Z

In order to expose edition dependent divergences in some tests in the test suite, add explicit edition annotations. Some of these tests might require additional work to avoid the divergences, as they might have been unintentional. These are not exhaustive changes, purely opportunistic while I was looking at something else.

rustbot · 2025-06-09T17:53:47Z

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

estebank · 2025-06-09T18:14:55Z

cc rust-lang/compiler-team#861

estebank · 2025-06-09T18:22:01Z

tests/ui/impl-trait/issues/issue-54895.edition2024.stderr

+error[E0657]: `impl Trait` cannot capture higher-ranked lifetime from outer `impl Trait`
+  --> $DIR/issue-54895.rs:18:40
+   |
+LL | fn f() -> impl for<'a> Trait<'a, Out = impl Sized + 'a> {
+   |                                        ^^^^^^^^^^^^^^^ `impl Trait` implicitly captures all lifetimes in scope
+   |
+note: lifetime declared here
+  --> $DIR/issue-54895.rs:18:20
+   |
+LL | fn f() -> impl for<'a> Trait<'a, Out = impl Sized + 'a> {
+   |                    ^^
+
+error[E0657]: `impl Trait` cannot capture higher-ranked lifetime from outer `impl Trait`
+  --> $DIR/issue-54895.rs:18:53
+   |
+LL | fn f() -> impl for<'a> Trait<'a, Out = impl Sized + 'a> {
+   |                                                     ^^
+   |
+note: lifetime declared here
+  --> $DIR/issue-54895.rs:18:20
+   |
+LL | fn f() -> impl for<'a> Trait<'a, Out = impl Sized + 'a> {
+   |                    ^^


These duplicated errors are unfortunate and quite common throughout the test suite.

estebank · 2025-06-09T18:22:46Z

tests/ui/impl-trait/impl-fn-predefined-lifetimes.edition2024.stderr

+LL | fn a<'a>() -> impl Fn(&'a u8) -> (impl Debug + '_) {
+   |      -- this generic parameter must be used with a generic lifetime parameter


The last edition changes the span being pointed at in such a way that the wording should change (or get the span from previous editions back).

fee1-dead · 2025-06-11T04:48:03Z

The parts about bare trait names in type position LGTM, but it would probably be better if someone else who knew about RPITs better to assess the changes in those tests

r? compiler

BoxyUwU · 2025-06-23T16:03:04Z

r? compiler

WaffleLapkin

Some diagnostics are bad, but that's a pre-existing issue. @estebank would you mind opening issues for the bad cases here?

This improves test coverage, which seems like a good idea.

WaffleLapkin · 2025-06-24T21:09:38Z

tests/ui/did_you_mean/bad-assoc-ty.rs

+//@revisions: edition2015 edition2021
+//@[edition2015] edition:2015
+//@[edition2021] edition:2021


maybe we should have a shorthand for this 🤔

WaffleLapkin · 2025-06-24T22:32:53Z

@bors r=fee1-dead,WaffleLapkin rollup

bors · 2025-06-24T22:32:57Z

📌 Commit ce7480d has been approved by fee1-dead,WaffleLapkin

It is now in the queue for this repository.

…s, r=fee1-dead,WaffleLapkin Add edition checks for some tests that had divergent output In order to expose edition dependent divergences in some tests in the test suite, add explicit `edition` annotations. Some of these tests might require additional work to *avoid* the divergences, as they might have been unintentional. These are not exhaustive changes, purely opportunistic while I was looking at something else.

workingjubilee · 2025-06-25T02:14:56Z

This needs to be rebased and blessed.

@bors r-

workingjubilee · 2025-06-25T02:55:35Z

@bors rollup=iffy

If we ever start testing every edition, using a new keyword unnecessarily will cause divergent output, so pre-emptively change `gen` into `generator`.

In order to expose edition dependent divergences in some tests in the test suite, add explicit `edition` annotations. Some of these tests might require additional work to *avoid* the divergences, as they might have been unintentional. These are not exhaustive changes, purely opportunistic while looking at something else.

estebank · 2025-06-25T20:12:13Z

@bors r=fee1-dead,WaffleLapkin

bors · 2025-06-25T20:12:16Z

📌 Commit 8c3a033 has been approved by fee1-dead,WaffleLapkin

It is now in the queue for this repository.

workingjubilee · 2025-06-26T01:06:53Z

@bors p=5

…s, r=fee1-dead,WaffleLapkin Add edition checks for some tests that had divergent output In order to expose edition dependent divergences in some tests in the test suite, add explicit `edition` annotations. Some of these tests might require additional work to *avoid* the divergences, as they might have been unintentional. These are not exhaustive changes, purely opportunistic while I was looking at something else.

Rollup of 17 pull requests Successful merges: - #124595 (Suggest cloning `Arc` moved into closure) - #139594 (Simplify `ObligationCauseCode::IfExpression`) - #141311 (make `tidy-alphabetical` use a natural sort) - #141648 ([rustdoc] Do not emit redundant_explicit_links lint if the doc comment comes from expansion) - #142255 (Add edition checks for some tests that had divergent output) - #142285 (tests: Do not run afoul of asm.validity.non-exhaustive in input-stats) - #142549 (small iter.intersperse.fold() optimization) - #142637 (Remove some glob imports from the type system) - #142647 ([perf] Compute hard errors without diagnostics in impl_intersection_has_impossible_obligation) - #142700 (Remove incorrect comments in `Weak`) - #142884 (StableMIR: Add method to retrieve body of coroutine) - #142925 (Rewrite `.gitattributes` CRLF ui tests into run-make tests) - #143001 (Rename run always ) - #143010 (Update `browser-ui-test` version to `0.20.7`) - #143015 (Add `sym::macro_pin` diagnostic item for `core::pin::pin!()`) - #143020 (codegen_fn_attrs: make comment more precise) - #143033 (Expand const-stabilized API links in relnotes) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-06-26T13:20:19Z

⌛ Testing commit 8c3a033 with merge 3b9d04c...

…ead,WaffleLapkin Add edition checks for some tests that had divergent output In order to expose edition dependent divergences in some tests in the test suite, add explicit `edition` annotations. Some of these tests might require additional work to *avoid* the divergences, as they might have been unintentional. These are not exhaustive changes, purely opportunistic while I was looking at something else.

rustbot assigned fee1-dead Jun 9, 2025

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 Jun 9, 2025

This comment has been minimized.

Sign in to view

estebank force-pushed the edition-diagnostic-changes branch from 85c28a9 to ce7480d Compare June 9, 2025 18:20

estebank commented Jun 9, 2025

View reviewed changes

rustbot assigned BoxyUwU and unassigned fee1-dead Jun 11, 2025

rustbot assigned WaffleLapkin and unassigned BoxyUwU Jun 23, 2025

WaffleLapkin approved these changes Jun 24, 2025

View reviewed changes

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 Jun 24, 2025

workingjubilee mentioned this pull request Jun 25, 2025

Rollup of 15 pull requests #142995

Closed

workingjubilee closed this Jun 25, 2025

workingjubilee reopened this Jun 25, 2025

This comment has been minimized.

Sign in to view

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 Jun 25, 2025

This comment has been minimized.

Sign in to view

estebank added 2 commits June 25, 2025 16:52

Do not use gen as binding name

f1fb323

If we ever start testing every edition, using a new keyword unnecessarily will cause divergent output, so pre-emptively change `gen` into `generator`.

estebank force-pushed the edition-diagnostic-changes branch from ce7480d to 8c3a033 Compare June 25, 2025 17:02

estebank mentioned this pull request Jun 25, 2025

Higher-ranked lifetimes captured by impl Trait result in too many errors in 2024 edition #143022

Open

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 Jun 25, 2025

workingjubilee mentioned this pull request Jun 26, 2025

Rollup of 17 pull requests #143039

Closed

		LL \| fn a<'a>() -> impl Fn(&'a u8) -> (impl Debug + '_) {
		\| -- this generic parameter must be used with a generic lifetime parameter

Add edition checks for some tests that had divergent output #142255

Are you sure you want to change the base?

Add edition checks for some tests that had divergent output #142255

Conversation

estebank commented Jun 9, 2025

Uh oh!

rustbot commented Jun 9, 2025

Uh oh!

This comment has been minimized.

estebank commented Jun 9, 2025

Uh oh!

estebank Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

estebank Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead commented Jun 11, 2025

Uh oh!

BoxyUwU commented Jun 23, 2025

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin commented Jun 24, 2025

Uh oh!

bors commented Jun 24, 2025

Uh oh!

This comment has been minimized.

workingjubilee commented Jun 25, 2025

Uh oh!

workingjubilee commented Jun 25, 2025

Uh oh!

This comment has been minimized.

estebank commented Jun 25, 2025

Uh oh!

bors commented Jun 25, 2025

Uh oh!

workingjubilee commented Jun 26, 2025

Uh oh!

bors commented Jun 26, 2025

Uh oh!

Uh oh!