user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HasAttrs support for GenericParam

Browse source
This commit is contained in:
varkor 2018-06-13 13:29:40 +01:00
parent 390aa5d421
commit 8bc3a35576
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/attr.rs
View file

@ -1446,17 +1446,12 @@ impl HasAttrs for Stmt {
impl HasAttrs for GenericParam {
fn attrs(&self) -> &[ast::Attribute] {
match self {
GenericParam::Lifetime(lifetime) => lifetime.attrs(),
GenericParam::Type(ty) => ty.attrs(),
}
&self.attrs
}
fn map_attrs<F: FnOnce(Vec<Attribute>) -> Vec<Attribute>>(self, f: F) -> Self {
match self {
GenericParam::Lifetime(lifetime) => GenericParam::Lifetime(lifetime.map_attrs(f)),
GenericParam::Type(ty) => GenericParam::Type(ty.map_attrs(f)),
}
fn map_attrs<F: FnOnce(Vec<Attribute>) -> Vec<Attribute>>(mut self, f: F) -> Self {
self.attrs = self.attrs.map_attrs(f);
self
}
}
@ -1479,5 +1474,5 @@ macro_rules! derive_has_attrs {
derive_has_attrs! {
Item, Expr, Local, ast::ForeignItem, ast::StructField, ast::ImplItem, ast::TraitItem, ast::Arm,
ast::Field, ast::FieldPat, ast::Variant_, ast::LifetimeDef, ast::TyParam
ast::Field, ast::FieldPat, ast::Variant_
}

2
src/libsyntax/parse/parser.rs
View file

@ -4752,7 +4752,7 @@ impl<'a> Parser<'a> {
self.span_err(question_span,
"`?` may only modify trait bounds, not lifetime bounds");
}
bounds.push(Outlives(RegionTyParamBound(self.expect_lifetime())));
bounds.push(Outlives(self.expect_lifetime()));
if has_parens {
self.expect(&token::CloseDelim(token::Paren))?;
self.span_err(self.prev_span,