Remove edition umbrella features. #118802

ehuss · 2023-12-10T16:49:26Z

In the 2018 edition, there was an "umbrella" feature #[feature(rust_2018_preview)] which was used to enable several other features at once. This umbrella mechanism was not used in the 2021 edition and likely will not be used in 2024 either. During 2018 users reported that setting the feature was awkward, especially since they already needed to opt-in via the edition mechanism.

This PR removes this mechanism because I believe it will not be used (and will clean up and simplify the code). I believe that there are better ways to handle features and editions. In short:

For highly experimental features, that may or may not be involved in an edition, they can implement regular feature gates like tcx.features().my_feature.
For experimental features that might be involved in an edition, they should implement gates with tcx.features().my_feature && span.at_least_rust_20xx(). This requires the user to still specify #![feature(my_feature)], to avoid disrupting testing of other edition features which are ready and have been accepted within the edition.
For experimental features that have graduated to definitely be part of an edition, they should implement gates with tcx.features().my_feature || span.at_least_rust_20xx(), or just remove the feature check altogether and just check span.at_least_rust_20xx().
For relatively simple changes, they can skip the whole feature gating thing and just check span.at_least_rust_20xx(), and rely on the instability of the edition itself (which requires -Zunstable-options) to gate it.

I am working on documenting all of this in the rustc-dev-guide.

rustbot · 2023-12-10T16:49:34Z

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-12-10T16:49:36Z

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

GuillaumeGomez · 2023-12-10T16:51:18Z

compiler/rustc_error_codes/src/error_codes.rs

@@ -429,7 +429,6 @@ E0700: include_str!("./error_codes/E0700.md"),
 E0701: include_str!("./error_codes/E0701.md"),
 E0703: include_str!("./error_codes/E0703.md"),
 E0704: include_str!("./error_codes/E0704.md"),
-E0705: include_str!("./error_codes/E0705.md"),


Please put it back and update the explanation to say it's not emitted anymore (CI will fail in any case explaining this too 😉).

Yep. I saw others were "removed" and didn't bother to read all the comments.

bors · 2023-12-10T18:45:58Z

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

GuillaumeGomez · 2023-12-10T18:57:08Z

compiler/rustc_error_codes/src/error_codes/E0705.md

@@ -1,3 +1,5 @@
+#### Note: this error code is no longer emitted by the compiler.


You'll need to remove E0705 from the code blocks labels below as well.

OK, I was a little confused why that wasn't generating an error. The rust2018 tag was incorrect, and was causing rustdoc to ignore the code block.

Oh interesting. Might be interesting to add a check for that then. Adding that to my todo list.

TaKO8Ki · 2023-12-11T02:32:58Z

@bors r+

bors · 2023-12-11T02:33:00Z

📌 Commit f481596 has been approved by TaKO8Ki

It is now in the queue for this repository.

…KO8Ki Remove edition umbrella features. In the 2018 edition, there was an "umbrella" feature `#[feature(rust_2018_preview)]` which was used to enable several other features at once. This umbrella mechanism was not used in the 2021 edition and likely will not be used in 2024 either. During 2018 users reported that setting the feature was awkward, especially since they already needed to opt-in via the edition mechanism. This PR removes this mechanism because I believe it will not be used (and will clean up and simplify the code). I believe that there are better ways to handle features and editions. In short: - For highly experimental features, that may or may not be involved in an edition, they can implement regular feature gates like `tcx.features().my_feature`. - For experimental features that *might* be involved in an edition, they should implement gates with `tcx.features().my_feature && span.at_least_rust_20xx()`. This requires the user to still specify `#![feature(my_feature)]`, to avoid disrupting testing of other edition features which are ready and have been accepted within the edition. - For experimental features that have graduated to definitely be part of an edition, they should implement gates with `tcx.features().my_feature || span.at_least_rust_20xx()`, or just remove the feature check altogether and just check `span.at_least_rust_20xx()`. - For relatively simple changes, they can skip the whole feature gating thing and just check `span.at_least_rust_20xx()`, and rely on the instability of the edition itself (which requires `-Zunstable-options`) to gate it. I am working on documenting all of this in the rustc-dev-guide.

…llaumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#118417 (Add unstable `-Zdefault-hidden-visibility` cmdline flag for `rustc`.) - rust-lang#118661 (Restore `const PartialEq`) - rust-lang#118802 (Remove edition umbrella features.) - rust-lang#118807 (Remove an allocation in min_stack) - rust-lang#118812 (rustdoc-search: do not treat associated type names as types) r? `@ghost` `@rustbot` modify labels: rollup

…llaumeGomez Rollup of 3 pull requests Successful merges: - rust-lang#118802 (Remove edition umbrella features.) - rust-lang#118807 (Remove an allocation in min_stack) - rust-lang#118812 (rustdoc-search: do not treat associated type names as types) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#118802 - ehuss:remove-edition-preview, r=TaKO8Ki Remove edition umbrella features. In the 2018 edition, there was an "umbrella" feature `#[feature(rust_2018_preview)]` which was used to enable several other features at once. This umbrella mechanism was not used in the 2021 edition and likely will not be used in 2024 either. During 2018 users reported that setting the feature was awkward, especially since they already needed to opt-in via the edition mechanism. This PR removes this mechanism because I believe it will not be used (and will clean up and simplify the code). I believe that there are better ways to handle features and editions. In short: - For highly experimental features, that may or may not be involved in an edition, they can implement regular feature gates like `tcx.features().my_feature`. - For experimental features that *might* be involved in an edition, they should implement gates with `tcx.features().my_feature && span.at_least_rust_20xx()`. This requires the user to still specify `#![feature(my_feature)]`, to avoid disrupting testing of other edition features which are ready and have been accepted within the edition. - For experimental features that have graduated to definitely be part of an edition, they should implement gates with `tcx.features().my_feature || span.at_least_rust_20xx()`, or just remove the feature check altogether and just check `span.at_least_rust_20xx()`. - For relatively simple changes, they can skip the whole feature gating thing and just check `span.at_least_rust_20xx()`, and rely on the instability of the edition itself (which requires `-Zunstable-options`) to gate it. I am working on documenting all of this in the rustc-dev-guide.

Rustin170506 · 2023-12-12T02:44:38Z

Note: This PR has broken the cargo nightly tests. See: rust-lang/cargo#13152 (comment)

…, r=notriddle Add rustX check to codeblock attributes lint We discovered this issue [here](rust-lang#118802 (comment)). I assume that the issue will be present in other places outside of the compiler so it's worth adding a check for it. First commit is just a small cleanup about variables creation which was a bit strange (at least more than necessary). r? `@notriddle`

…, r=notriddle Add rustX check to codeblock attributes lint We discovered this issue [here](rust-lang#118802 (comment)). I assume that the issue will be present in other places outside of the compiler so it's worth adding a check for it. First commit is just a small cleanup about variables creation which was a bit strange (at least more than necessary). r? ``@notriddle``

nnethercote · 2023-12-12T23:48:22Z

Note: this section of the rustc-dev-guide needs updating, to remove the bits about editions.

ehuss · 2023-12-13T00:35:29Z

Thanks for the heads up! Posted the fix at rust-lang/rustc-dev-guide#1836.

…, r=notriddle Add rustX check to codeblock attributes lint We discovered this issue [here](rust-lang#118802 (comment)). I assume that the issue will be present in other places outside of the compiler so it's worth adding a check for it. First commit is just a small cleanup about variables creation which was a bit strange (at least more than necessary). r? ```@notriddle```

Rollup merge of rust-lang#118872 - GuillaumeGomez:codeblock-attr-lint, r=notriddle Add rustX check to codeblock attributes lint We discovered this issue [here](rust-lang#118802 (comment)). I assume that the issue will be present in other places outside of the compiler so it's worth adding a check for it. First commit is just a small cleanup about variables creation which was a bit strange (at least more than necessary). r? ```@notriddle```

…KO8Ki Remove edition umbrella features. In the 2018 edition, there was an "umbrella" feature `#[feature(rust_2018_preview)]` which was used to enable several other features at once. This umbrella mechanism was not used in the 2021 edition and likely will not be used in 2024 either. During 2018 users reported that setting the feature was awkward, especially since they already needed to opt-in via the edition mechanism. This PR removes this mechanism because I believe it will not be used (and will clean up and simplify the code). I believe that there are better ways to handle features and editions. In short: - For highly experimental features, that may or may not be involved in an edition, they can implement regular feature gates like `tcx.features().my_feature`. - For experimental features that *might* be involved in an edition, they should implement gates with `tcx.features().my_feature && span.at_least_rust_20xx()`. This requires the user to still specify `#![feature(my_feature)]`, to avoid disrupting testing of other edition features which are ready and have been accepted within the edition. - For experimental features that have graduated to definitely be part of an edition, they should implement gates with `tcx.features().my_feature || span.at_least_rust_20xx()`, or just remove the feature check altogether and just check `span.at_least_rust_20xx()`. - For relatively simple changes, they can skip the whole feature gating thing and just check `span.at_least_rust_20xx()`, and rely on the instability of the edition itself (which requires `-Zunstable-options`) to gate it. I am working on documenting all of this in the rustc-dev-guide.

rustbot assigned TaKO8Ki Dec 10, 2023

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 Dec 10, 2023

GuillaumeGomez reviewed Dec 10, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

ehuss force-pushed the remove-edition-preview branch from e974fe4 to f0255e4 Compare December 10, 2023 17:34

GuillaumeGomez reviewed Dec 10, 2023

View reviewed changes

ehuss force-pushed the remove-edition-preview branch from f0255e4 to 6a94733 Compare December 10, 2023 21:01

Remove edition umbrella features.

f481596

ehuss force-pushed the remove-edition-preview branch from 6a94733 to f481596 Compare December 10, 2023 21:03

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 Dec 11, 2023

GuillaumeGomez mentioned this pull request Dec 11, 2023

Rollup of 4 pull requests #118820

Closed

GuillaumeGomez mentioned this pull request Dec 11, 2023

Rollup of 5 pull requests #118821

Closed

GuillaumeGomez mentioned this pull request Dec 11, 2023

Rollup of 3 pull requests #118823

Merged

bors merged commit 54d6bde into rust-lang:master Dec 11, 2023
11 checks passed

rustbot added this to the 1.76.0 milestone Dec 11, 2023

GuillaumeGomez mentioned this pull request Dec 12, 2023

Add rustX check to codeblock attributes lint #118872

Merged

ehuss mentioned this pull request Dec 13, 2023

Remove feature edition fields. rust-lang/rustc-dev-guide#1836

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove edition umbrella features. #118802

Remove edition umbrella features. #118802

ehuss commented Dec 10, 2023

rustbot commented Dec 10, 2023

rustbot commented Dec 10, 2023

GuillaumeGomez Dec 10, 2023

ehuss Dec 10, 2023

This comment has been minimized.

bors commented Dec 10, 2023

GuillaumeGomez Dec 10, 2023

ehuss Dec 10, 2023

GuillaumeGomez Dec 10, 2023

TaKO8Ki commented Dec 11, 2023

bors commented Dec 11, 2023

Rustin170506 commented Dec 12, 2023

nnethercote commented Dec 12, 2023

ehuss commented Dec 13, 2023

		@@ -1,3 +1,5 @@
		#### Note: this error code is no longer emitted by the compiler.

Remove edition umbrella features. #118802

Remove edition umbrella features. #118802

Conversation

ehuss commented Dec 10, 2023

rustbot commented Dec 10, 2023

rustbot commented Dec 10, 2023

GuillaumeGomez Dec 10, 2023

Choose a reason for hiding this comment

ehuss Dec 10, 2023

Choose a reason for hiding this comment

This comment has been minimized.

bors commented Dec 10, 2023

GuillaumeGomez Dec 10, 2023

Choose a reason for hiding this comment

ehuss Dec 10, 2023

Choose a reason for hiding this comment

GuillaumeGomez Dec 10, 2023

Choose a reason for hiding this comment

TaKO8Ki commented Dec 11, 2023

bors commented Dec 11, 2023

Rustin170506 commented Dec 12, 2023

nnethercote commented Dec 12, 2023

ehuss commented Dec 13, 2023