Rollup merge of #49242 - Mrowqa:typaram-attrs, r=petrochenkov
Pass attributes to hir::TyParam Required by https://github.com/servo/servo/pull/20264 Discussed here: https://gitter.im/servo/servo?at=5aafdcd1012ff2bf681da97a CC @nikomatsakis
This commit is contained in:
commit
eb99deb9c6
@ -809,7 +809,7 @@ impl<'a> LoweringContext<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
fn lower_attrs(&mut self, attrs: &Vec<Attribute>) -> hir::HirVec<Attribute> {
|
||||
fn lower_attrs(&mut self, attrs: &[Attribute]) -> hir::HirVec<Attribute> {
|
||||
attrs.iter().map(|a| self.lower_attr(a)).collect::<Vec<_>>().into()
|
||||
}
|
||||
|
||||
@ -1019,6 +1019,7 @@ impl<'a> LoweringContext<'a> {
|
||||
span,
|
||||
pure_wrt_drop: false,
|
||||
synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
|
||||
attrs: P::new(),
|
||||
});
|
||||
|
||||
hir::TyPath(hir::QPath::Resolved(None, P(hir::Path {
|
||||
@ -1585,6 +1586,7 @@ impl<'a> LoweringContext<'a> {
|
||||
.filter(|attr| attr.check_name("rustc_synthetic"))
|
||||
.map(|_| hir::SyntheticTyParamKind::ImplTrait)
|
||||
.nth(0),
|
||||
attrs: self.lower_attrs(&tp.attrs),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -962,6 +962,7 @@ impl<'hir> Map<'hir> {
|
||||
Some(NodeField(ref f)) => Some(&f.attrs[..]),
|
||||
Some(NodeExpr(ref e)) => Some(&*e.attrs),
|
||||
Some(NodeStmt(ref s)) => Some(s.node.attrs()),
|
||||
Some(NodeTyParam(tp)) => Some(&tp.attrs[..]),
|
||||
// unit/tuple structs take the attributes straight from
|
||||
// the struct definition.
|
||||
Some(NodeStructCtor(_)) => {
|
||||
|
@ -414,6 +414,7 @@ pub struct TyParam {
|
||||
pub span: Span,
|
||||
pub pure_wrt_drop: bool,
|
||||
pub synthetic: Option<SyntheticTyParamKind>,
|
||||
pub attrs: HirVec<Attribute>,
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
|
||||
|
@ -203,7 +203,8 @@ impl_stable_hash_for!(struct hir::TyParam {
|
||||
default,
|
||||
span,
|
||||
pure_wrt_drop,
|
||||
synthetic
|
||||
synthetic,
|
||||
attrs
|
||||
});
|
||||
|
||||
impl_stable_hash_for!(enum hir::GenericParam {
|
||||
|
Loading…
Reference in New Issue
Block a user