Lift attrs into hir::GenericParam

Author: varkor

src/librustc/hir/intravisit.rs

@@ -748,11 +748,9 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v Generi
     }
     match param.kind {
         GenericParamKind::Lifetime { .. } => {}
-        GenericParamKind::Type { ref default, ref attrs, .. } => {
-            walk_list!(visitor, visit_ty, default);
-            walk_list!(visitor, visit_attribute, attrs.iter());
-        }
+        GenericParamKind::Type { ref default, .. } => walk_list!(visitor, visit_ty, default),
     }
+    walk_list!(visitor, visit_attribute, &param.attrs);
     walk_list!(visitor, visit_param_bound, &param.bounds);
 }
 

src/librustc/hir/lowering.rs

@@ -695,9 +695,10 @@ impl<'a> LoweringContext<'a> {
                 hir::GenericParam {
                     id: def_node_id,
                     name: hir_name,
+                    attrs: hir_vec![],
+                    bounds: hir_vec![],
                     span,
                     pure_wrt_drop: false,
-                    bounds: vec![].into(),
                     kind: hir::GenericParamKind::Lifetime { in_band: true }
                 }
             })
@@ -1239,11 +1240,11 @@ impl<'a> LoweringContext<'a> {
                             name: ParamName::Plain(name),
                             span,
                             pure_wrt_drop: false,
+                            attrs: hir_vec![],
                             bounds: hir_bounds,
                             kind: hir::GenericParamKind::Type {
                                 default: None,
                                 synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
-                                attrs: P::new(),
                             }
                         });
 
@@ -1413,7 +1414,8 @@ impl<'a> LoweringContext<'a> {
                         name,
                         span: lifetime.span,
                         pure_wrt_drop: false,
-                        bounds: vec![].into(),
+                        attrs: hir_vec![],
+                        bounds: hir_vec![],
                         kind: hir::GenericParamKind::Lifetime {
                             in_band: false,
                         }
@@ -1950,6 +1952,7 @@ impl<'a> LoweringContext<'a> {
                     name: param_name,
                     span: lt.span,
                     pure_wrt_drop: attr::contains_name(&param.attrs, "may_dangle"),
+                    attrs: self.lower_attrs(&param.attrs),
                     bounds,
                     kind: hir::GenericParamKind::Lifetime { in_band: false }
                 };
@@ -1980,6 +1983,7 @@ impl<'a> LoweringContext<'a> {
                     name: hir::ParamName::Plain(name),
                     span: param.ident.span,
                     pure_wrt_drop: attr::contains_name(&param.attrs, "may_dangle"),
+                    attrs: self.lower_attrs(&param.attrs),
                     bounds,
                     kind: hir::GenericParamKind::Type {
                         default: default.as_ref().map(|x| {
@@ -1989,7 +1993,6 @@ impl<'a> LoweringContext<'a> {
                                               .filter(|attr| attr.check_name("rustc_synthetic"))
                                               .map(|_| hir::SyntheticTyParamKind::ImplTrait)
                                               .next(),
-                        attrs: self.lower_attrs(&param.attrs),
                     }
                 }
             }

src/librustc/hir/map/mod.rs

@@ -974,10 +974,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(NodeGenericParam(param)) => match param.kind {
-                GenericParamKind::Lifetime { .. } => None,
-                GenericParamKind::Type { ref attrs, .. } => Some(&attrs[..]),
-            }
+            Some(NodeGenericParam(param)) => Some(&param.attrs[..]),
             // unit/tuple structs take the attributes straight from
             // the struct definition.
             Some(NodeStructCtor(_)) => {

src/librustc/hir/mod.rs

@@ -471,14 +471,14 @@ pub enum GenericParamKind {
     Type {
         default: Option<P<Ty>>,
         synthetic: Option<SyntheticTyParamKind>,
-        attrs: HirVec<Attribute>,
     }
 }
 
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
 pub struct GenericParam {
     pub id: NodeId,
     pub name: ParamName,
+    pub attrs: HirVec<Attribute>,
     pub bounds: ParamBounds,
     pub span: Span,
     pub pure_wrt_drop: bool,

src/librustc/ich/impls_hir.rs

@@ -203,6 +203,7 @@ impl_stable_hash_for!(struct hir::GenericParam {
     name,
     span,
     pure_wrt_drop,
+    attrs,
     bounds,
     kind
 });
@@ -216,10 +217,9 @@ impl<'a> HashStable<StableHashingContext<'a>> for hir::GenericParamKind {
             hir::GenericParamKind::Lifetime { in_band } => {
                 in_band.hash_stable(hcx, hasher);
             }
-            hir::GenericParamKind::Type { ref default, synthetic, attrs } => {
+            hir::GenericParamKind::Type { ref default, synthetic } => {
                 default.hash_stable(hcx, hasher);
                 synthetic.hash_stable(hcx, hasher);
-                attrs.hash_stable(hcx, hasher);
             }
         }
     }