diff options
| author | varkor <github@varkor.com> | 2018-05-26 00:27:54 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2018-06-20 12:21:07 +0100 |
| commit | 82dba3d419d3cfac00cc90bc8d078e6ae0a724f5 (patch) | |
| tree | a9957cd9109080725a5ffd4e8615901ed16443b8 /src/libsyntax_ext/deriving/generic | |
| parent | d643946550fa349729184a4f70abc01e21ceddc0 (diff) | |
| download | rust-82dba3d419d3cfac00cc90bc8d078e6ae0a724f5.tar.gz rust-82dba3d419d3cfac00cc90bc8d078e6ae0a724f5.zip | |
Refactor hir::GenericParam as a struct
Diffstat (limited to 'src/libsyntax_ext/deriving/generic')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index f85091b0e71..4bc8d208bab 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -568,7 +568,8 @@ impl<'a> TraitDef<'a> { bounds.push((*declared_bound).clone()); } - GenericParamAST::Type(cx.typaram(self.span, ty_param.ident, vec![], bounds, None)) + let ty_param = cx.typaram(self.span, ty_param.ident, vec![], bounds, None); + GenericParamAST::Type(ty_param) } } })); diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index 92046262ed2..22487e7bfe3 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -192,7 +192,9 @@ impl<'a> Ty<'a> { let ty_params: Vec<P<ast::Ty>> = self_generics.params .iter() .filter_map(|param| match *param { - GenericParamAST::Type(ref ty_param) => Some(cx.ty_ident(span, ty_param.ident)), + GenericParamAST::Type(ref ty_param) => { + Some(cx.ty_ident(span, ty_param.ident)) + } _ => None, }) .collect(); @@ -280,7 +282,8 @@ impl<'a> LifetimeBounds<'a> { let bounds = bounds.iter() .map(|b| cx.lifetime(span, Ident::from_str(b))) .collect(); - GenericParamAST::Lifetime(cx.lifetime_def(span, Ident::from_str(lt), vec![], bounds)) + let lifetime_def = cx.lifetime_def(span, Ident::from_str(lt), vec![], bounds); + GenericParamAST::Lifetime(lifetime_def) }) .chain(self.bounds .iter() |