Skip to content

Commit 2a9f8fb

Browse files
est31Mark-Simulacrum
authored andcommitted
Update the stabilization guide to refer to the new placeholder system
The stabilization process is changed to now use `CURRENT_RUSTC_VERSION` instead of spelling out whatever version is currently the latest. This placeholder will be replaced during the release process with the correct version.
1 parent b5a632f commit 2a9f8fb

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

src/stabilization_guide.md

+5-21
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,6 @@ require steps beyond what this guide talks about.
9999
Note: Before we stabilize any feature, it's the rule that it
100100
should appear in the documentation.
101101

102-
### Determining the stabilization version
103-
104-
The version in which the feature will be stabilized *must* match
105-
the value of [the `src/version` file in `master`][src-version] when the PR is merged.
106-
107-
It's worth checking [the version schedule on the Forge][forge-versions] to see whether
108-
changes are coming soon. You'll usually use the version labelled "Nightly".
109-
"Nightly" is two versions higher than the current stable release,
110-
since what's currently in beta will be the next stable release,
111-
and any changes you're making now will be in the one after that.
112-
113-
No PR is merged instantly, so you'll want to be careful around release time.
114-
The version bump happens [the Friday before][forge-release-process] the stable release,
115-
not the same time as the release. So if you're opening a PR shortly before then,
116-
be prepared to update the version, or consider just opening it for one version
117-
higher than the current nightly, with a note saying not to merge until
118-
after the upcoming version bump.
119-
120102
### Updating the feature-gate listing
121103

122104
There is a central listing of feature-gates in
@@ -127,7 +109,7 @@ to stabilize, something like (this example is taken from
127109

128110
```rust,ignore
129111
// pub(restricted) visibilities (RFC 1422)
130-
(active, pub_restricted, "1.9.0", Some(32409)),
112+
(active, pub_restricted, "CURRENT_RUSTC_VERSION", Some(32409)),
131113
```
132114

133115
The above line should be moved down to the area for "accepted"
@@ -136,11 +118,13 @@ When it is done, it should look like:
136118

137119
```rust,ignore
138120
// pub(restricted) visibilities (RFC 1422)
139-
(accepted, pub_restricted, "1.31.0", Some(32409)),
121+
(accepted, pub_restricted, "CURRENT_RUSTC_VERSION", Some(32409)),
140122
// note that we changed this
141123
```
142124

143-
(The version here is the one discussed in the previous section.)
125+
(Even though you will encounter version numbers in the file of past changes,
126+
you should not put the rustc version you expect your stabilization to happen in,
127+
but instead `CURRENT_RUSTC_VERSION`)
144128

145129
### Removing existing uses of the feature-gate
146130

0 commit comments

Comments
 (0)