bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline and remove feature_removed function.

Browse source 
It has a single call site. This increases consistency because other
errors within `features` are emitted directly.
This commit is contained in:
Nicholas Nethercote 2023-10-05 11:18:51 +11:00
parent 9e2cd038b0
commit 5d9559e026
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_expand/src/config.rs
View file

@ -38,13 +38,6 @@ pub struct StripUnconfigured<'a> {
} }
pub fn features(sess: &Session, krate_attrs: &[Attribute]) -> Features { pub fn features(sess: &Session, krate_attrs: &[Attribute]) -> Features {
fn feature_removed(sess: &Session, span: Span, reason: Option<&str>) {
sess.emit_err(FeatureRemoved {
span,
reason: reason.map(|reason| FeatureRemovedReason { reason }),
});
}
fn active_features_up_to(edition: Edition) -> impl Iterator<Item = &'static Feature> { fn active_features_up_to(edition: Edition) -> impl Iterator<Item = &'static Feature> {
ACTIVE_FEATURES.iter().filter(move |feature| { ACTIVE_FEATURES.iter().filter(move |feature| {
if let Some(feature_edition) = feature.edition { if let Some(feature_edition) = feature.edition {
@ -167,7 +160,10 @@ pub fn features(sess: &Session, krate_attrs: &[Attribute]) -> Features {
if let FeatureState::Removed { reason } | FeatureState::Stabilized { reason } = if let FeatureState::Removed { reason } | FeatureState::Stabilized { reason } =
state state
{ {
feature_removed(sess, mi.span(), *reason); sess.emit_err(FeatureRemoved {
span: mi.span(),
reason: reason.map(|reason| FeatureRemovedReason { reason }),
});
continue; continue;
} }
} }