From 6015edf9af375385ca9eb2ebbb8794c782fa7244 Mon Sep 17 00:00:00 2001 From: varkor Date: Wed, 30 May 2018 16:49:39 +0100 Subject: Remove name from GenericParamKind::Lifetime --- src/libsyntax_ext/deriving/generic/mod.rs | 4 ++-- src/libsyntax_ext/deriving/generic/ty.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libsyntax_ext') 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)) -- cgit 1.4.1-3-g733a5