Fix additional comments

Author: varkor

src/librustc/hir/intravisit.rs

@@ -742,6 +742,7 @@ pub fn walk_param_bound<'v, V: Visitor<'v>>(visitor: &mut V, bound: &'v GenericB
 
 pub fn walk_generic_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v GenericParam) {
     visitor.visit_id(param.id);
+    walk_list!(visitor, visit_attribute, &param.attrs);
     match param.name {
         ParamName::Plain(name) => visitor.visit_name(param.span, name),
         ParamName::Fresh(_) => {}
@@ -750,7 +751,6 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v Generi
         GenericParamKind::Lifetime { .. } => {}
         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/libsyntax/visit.rs

@@ -488,12 +488,12 @@ pub fn walk_param_bound<'a, V: Visitor<'a>>(visitor: &mut V, bound: &'a GenericB
 
 pub fn walk_generic_param<'a, V: Visitor<'a>>(visitor: &mut V, param: &'a GenericParam) {
     visitor.visit_ident(param.ident);
+    walk_list!(visitor, visit_attribute, param.attrs.iter());
     walk_list!(visitor, visit_param_bound, &param.bounds);
     match param.kind {
         GenericParamKind::Lifetime => {}
         GenericParamKind::Type { ref default } => walk_list!(visitor, visit_ty, default),
     }
-    walk_list!(visitor, visit_attribute, param.attrs.iter());
 }
 
 pub fn walk_generics<'a, V: Visitor<'a>>(visitor: &mut V, generics: &'a Generics) {

src/libsyntax_ext/deriving/generic/mod.rs

@@ -666,7 +666,7 @@ impl<'a> TraitDef<'a> {
 
         let self_params: Vec<_> = generics.params.iter().map(|param| match param.kind {
             GenericParamKind::Lifetime { .. } => {
-                GenericArg::Lifetime(ast::Lifetime { id: param.id, ident: param.ident })
+                GenericArg::Lifetime(cx.lifetime(self.span, param.ident))
             }
             GenericParamKind::Type { .. } => {
                 GenericArg::Type(cx.ty_ident(self.span, param.ident))