about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2018-05-30 16:49:39 +0100
committervarkor <github@varkor.com>2018-06-20 12:23:08 +0100
commit6015edf9af375385ca9eb2ebbb8794c782fa7244 (patch)
treee07b5a2233e2c32b950b84d3dd1547e62b983f5e /src/libsyntax_ext
parentc4e8e718807d1925769bdcdd055c6d8de05f20ce (diff)
downloadrust-6015edf9af375385ca9eb2ebbb8794c782fa7244.tar.gz
rust-6015edf9af375385ca9eb2ebbb8794c782fa7244.zip
Remove name from GenericParamKind::Lifetime
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/deriving/generic/mod.rs4
-rw-r--r--src/libsyntax_ext/deriving/generic/ty.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs
index a7d8156f4a0..89b50044129 100644
--- a/src/libsyntax_ext/deriving/generic/mod.rs
+++ b/src/libsyntax_ext/deriving/generic/mod.rs
@@ -665,8 +665,8 @@ impl<'a> TraitDef<'a> {
         let trait_ref = cx.trait_ref(trait_path);
 
         let self_params: Vec<_> = generics.params.iter().map(|param| match param.kind {
-            GenericParamKind::Lifetime { ref lifetime, .. } => {
-                GenericArg::Lifetime(*lifetime)
+            GenericParamKind::Lifetime { .. } => {
+                GenericArg::Lifetime(ast::Lifetime { id: param.id, ident: param.ident })
             }
             GenericParamKind::Type { .. } => {
                 GenericArg::Type(cx.ty_ident(self.span, param.ident))
diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs
index 327a35d39b3..99b6398160e 100644
--- a/src/libsyntax_ext/deriving/generic/ty.rs
+++ b/src/libsyntax_ext/deriving/generic/ty.rs
@@ -190,8 +190,8 @@ impl<'a> Ty<'a> {
         match *self {
             Self_ => {
                 let params: Vec<_> = generics.params.iter().map(|param| match param.kind {
-                    GenericParamKind::Lifetime { ref lifetime, .. } => {
-                        GenericArg::Lifetime(*lifetime)
+                    GenericParamKind::Lifetime { .. } => {
+                        GenericArg::Lifetime(ast::Lifetime { id: param.id, ident: param.ident })
                     }
                     GenericParamKind::Type { .. } => {
                         GenericArg::Type(cx.ty_ident(span, param.ident))