Fix additional comments

diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs
index e49a5e4ee6ae95fc4e1f1730f2784b18eb0e4707..de53262490bba14914880a61d9b5b39f6cc78807 100644 (file)
--- a/src/librustc/hir/intravisit.rs
+++ b/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);
 }
 

diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index 5476a3f0d2a7235a69adb3f5043287e474fdec3c..613f1a4f113bdf5377ba79b9ffb150edf43a6f11 100644 (file)
--- a/src/libsyntax/visit.rs
+++ b/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) {

diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs
index 44a07f532a78a2969d84997dbd6c7397ed41badf..672726d1475793e80340bda13a7e6bb66e3cc243 100644 (file)
--- a/src/libsyntax_ext/deriving/generic/mod.rs
+++ b/src/libsyntax_ext/deriving/generic/mod.rs
@@ -666,7 +666,7 @@ fn create_derived_impl(&self,
 
         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))