Rollup merge of rust-lang#90472 - joshtriplett:clarify-feature-acceptance, r=jyn514

matthiaskrgr · web-flow · commit bc26dbba1156 · 2021-11-02T23:48:48.000+01:00
Clarify what to do with accepted feature gates

The documentation only referenced `removed.rs`, but feature gates for
accepted features move to `accepted.rs`.
diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs
@@ -101,9 +101,13 @@ impl Feature {
     }
 }
 
+// See https://rustc-dev-guide.rust-lang.org/feature-gates.html#feature-gates for more
+// documentation about handling feature gates.
+//
 // If you change this, please modify `src/doc/unstable-book` as well.
 //
-// Don't ever remove anything from this list; move them to `removed.rs`.
+// Don't ever remove anything from this list; move them to `accepted.rs` if
+// accepted or `removed.rs` if removed.
 //
 // The version numbers here correspond to the version in which the current status
 // was set. This is most important for knowing when a particular feature became

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,13 @@ impl Feature {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+// See https://rustc-dev-guide.rust-lang.org/feature-gates.html#feature-gates for more`
	`105`	`+// documentation about handling feature gates.`
	`106`	`+//`
`104`	`107`	// If you change this, please modify `src/doc/unstable-book` as well.
`105`	`108`	`//`
`106`		-// Don't ever remove anything from this list; move them to `removed.rs`.
	`109`	+// Don't ever remove anything from this list; move them to `accepted.rs` if
	`110`	+// accepted or `removed.rs` if removed.
`107`	`111`	`//`
`108`	`112`	`// The version numbers here correspond to the version in which the current status`
`109`	`113`	`// was set. This is most important for knowing when a particular feature became`