Commit e82bca6

committed

remove no longer needd UnstableFeature type

1 parent 6ad17bd commit e82bca6Copy full SHA for e82bca6

File tree

-15

lines changed

-15

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ pub fn features(sess: &Session, krate_attrs: &[Attribute], crate_name: Symbol) -`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// If the enabled feature is unstable, record it.`
`106`		`- if UNSTABLE_FEATURES.iter().find(\|f\| name == f.feature.name).is_some() {`
	`106`	`+ if UNSTABLE_FEATURES.iter().find(\|f\| name == f.name).is_some() {`
`107`	`107`	`// When the ICE comes from core, alloc or std (approximation of the standard`
`108`	`108`	`// library), there's a chance that the person hitting the ICE may be using`
`109`	`109`	`// -Zbuild-std or similar with an untested target. The bug is probably in the`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ impl UnstableFeatures {`
`94`	`94`
`95`	`95`	`fn find_lang_feature_issue(feature: Symbol) -> Option<NonZero<u32>> {`
`96`	`96`	`// Search in all the feature lists.`
`97`		`- if let Some(f) = UNSTABLE_FEATURES.iter().find(\|f\| f.feature.name == feature) {`
`98`		`- return f.feature.issue;`
	`97`	`+ if let Some(f) = UNSTABLE_FEATURES.iter().find(\|f\| f.name == feature) {`
	`98`	`+ return f.issue;`
`99`	`99`	`}`
`100`	`100`	`if let Some(f) = ACCEPTED_FEATURES.iter().find(\|f\| f.name == feature) {`
`101`	`101`	`return f.issue;`

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,6 @@ use rustc_span::symbol::{Symbol, sym};`
`6`	`6`
`7`	`7`	`use super::{Feature, to_nonzero};`
`8`	`8`
`9`		`-pub struct UnstableFeature {`
`10`		`- pub feature: Feature,`
`11`		`-}`
`12`		`-`
`13`	`9`	`#[derive(PartialEq)]`
`14`	`10`	`enum FeatureStatus {`
`15`	`11`	`Default,`
`@@ -82,13 +78,11 @@ macro_rules! declare_features {`
`82`	`78`	`)+) => {`
`83`	`79`	`/// Unstable language features that are being implemented or being`
`84`	`80`	`/// considered for acceptance (stabilization) or removal.`
`85`		`- pub const UNSTABLE_FEATURES: &[UnstableFeature] = &[`
`86`		`- $(UnstableFeature {`
`87`		`- feature: Feature {`
`88`		`- name: sym::$feature,`
`89`		`- since: $ver,`
`90`		`- issue: to_nonzero($issue),`
`91`		`- },`
	`81`	`+ pub const UNSTABLE_FEATURES: &[Feature] = &[`
	`82`	`+ $(Feature {`
	`83`	`+ name: sym::$feature,`
	`84`	`+ since: $ver,`
	`85`	`+ issue: to_nonzero($issue),`
`92`	`86`	`}),+`
`93`	`87`	`];`
`94`	`88`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ impl<'tcx> HashStable<StableHashingContext<'tcx>> for rustc_feature::Features {`
`117`	`117`
`118`	`118`	`// FIXME: why do we hash something that is a compile-time constant?`
`119`	`119`	`for feature in rustc_feature::UNSTABLE_FEATURES.iter() {`
`120`		`- feature.feature.name.hash_stable(hcx, hasher);`
	`120`	`+ feature.name.hash_stable(hcx, hasher);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`

Comments

(0)