From d7e762e8f68239d2b1c1092389d3cb3af70974ae Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 12 Dec 2023 16:34:10 -0800
Subject: [PATCH] Remove feature edition fields.
---
src/feature-gates.md | 10 +++++-----
src/implementing_new_features.md | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/feature-gates.md b/src/feature-gates.md
index 788f93d66..24ce9bb71 100644
--- a/src/feature-gates.md
+++ b/src/feature-gates.md
@@ -25,7 +25,7 @@ To remove a feature gate, follow these steps:
```rust,ignore
/// description of feature
- (unstable, $feature_name, "$version", Some($tracking_issue_number), $edition)
+ (unstable, $feature_name, "$version", Some($tracking_issue_number))
```
2. Add a modified version of the feature gate declaration that you just
@@ -33,7 +33,7 @@ To remove a feature gate, follow these steps:
```rust,ignore
/// description of feature
- (removed, $old_feature_name, "$version", Some($tracking_issue_number), $edition,
+ (removed, $old_feature_name, "$version", Some($tracking_issue_number),
Some("$why_it_was_removed"))
```
@@ -50,7 +50,7 @@ to follow when [removing a feature gate][removing]):
```rust,ignore
/// description of feature
- (unstable, $old_feature_name, "$version", Some($tracking_issue_number), $edition)
+ (unstable, $old_feature_name, "$version", Some($tracking_issue_number))
```
2. Add a modified version of the old feature gate declaration that you just
@@ -59,7 +59,7 @@ to follow when [removing a feature gate][removing]):
```rust,ignore
/// description of feature
/// Renamed to `$new_feature_name`
- (removed, $old_feature_name, "$version", Some($tracking_issue_number), $edition,
+ (removed, $old_feature_name, "$version", Some($tracking_issue_number),
Some("renamed to `$new_feature_name`"))
```
@@ -69,7 +69,7 @@ to follow when [removing a feature gate][removing]):
```rust,ignore
/// description of feature
- (unstable, $new_feature_name, "$version", Some($tracking_issue_number), $edition)
+ (unstable, $new_feature_name, "$version", Some($tracking_issue_number))
```
diff --git a/src/implementing_new_features.md b/src/implementing_new_features.md
index 427589dab..0140c09bb 100644
--- a/src/implementing_new_features.md
+++ b/src/implementing_new_features.md
@@ -128,10 +128,10 @@ a new unstable feature:
```rust ignore
/// description of feature
- (unstable, $feature_name, "CURRENT_RUSTC_VERSION", Some($tracking_issue_number), $edition)
+ (unstable, $feature_name, "CURRENT_RUSTC_VERSION", Some($tracking_issue_number))
```
- where `$edition` has the type `Option<Edition>`, and is typically just `None`. If you haven't yet
+ If you haven't yet
opened a tracking issue (e.g. because you want initial feedback on whether the feature is likely
to be accepted), you can temporarily use `None` - but make sure to update it before the PR is
merged!