diff options
| author | kennytm <kennytm@gmail.com> | 2018-11-07 18:01:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 18:01:53 +0800 |
| commit | 0708a6a7174d1dcff84cb44d2481fa3ff98cadac (patch) | |
| tree | 407fe8336093ce63493477cd009f570116c3408d /src/libsyntax | |
| parent | d64142bb2ebf1ce134142601868955b661d61b6a (diff) | |
| parent | d22ae75c9d6aeb4bb79b51e7c6fc3d824c736ac6 (diff) | |
| download | rust-0708a6a7174d1dcff84cb44d2481fa3ff98cadac.tar.gz rust-0708a6a7174d1dcff84cb44d2481fa3ff98cadac.zip | |
Rollup merge of #55510 - bitshifter:repr-feature-gate-fix, r=petrochenkov
Fix feature gate only being checked on first repr attr. Reported in https://github.com/rust-lang/rust/issues/33158#issuecomment-412185357.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr/mod.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index 5404420988c..64876659477 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -455,6 +455,11 @@ pub fn find_by_name<'a>(attrs: &'a [Attribute], name: &str) -> Option<&'a Attrib attrs.iter().find(|attr| attr.check_name(name)) } +pub fn filter_by_name<'a>(attrs: &'a [Attribute], name: &'a str) + -> impl Iterator<Item = &'a Attribute> { + attrs.iter().filter(move |attr| attr.check_name(name)) +} + pub fn first_attr_value_str_by_name(attrs: &[Attribute], name: &str) -> Option<Symbol> { attrs.iter() .find(|at| at.check_name(name)) diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index cb15c517c17..55652c481bd 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -1614,7 +1614,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { } ast::ItemKind::Struct(..) => { - if let Some(attr) = attr::find_by_name(&i.attrs[..], "repr") { + for attr in attr::filter_by_name(&i.attrs[..], "repr") { for item in attr.meta_item_list().unwrap_or_else(Vec::new) { if item.check_name("simd") { gate_feature_post!(&self, repr_simd, attr.span, |
