bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename ast::Variant_::name into ident + Fix rebase

Browse source
This commit is contained in:
Vadim Petrochenkov 2018-03-19 01:21:30 +03:00
parent 43ad972318
commit 62000c072e
21 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -1538,10 +1538,9 @@ impl<'a> MethodDef<'a> {
let summary = enum_def.variants
.iter()
.map(|v| {
let ident = v.node.name;
let sp = v.span.with_ctxt(trait_.span.ctxt());
let summary = trait_.summarise_struct(cx, &v.node.data);
(ident, sp, summary)
(v.node.ident, sp, summary)
})
.collect();
self.call_substructure_method(cx,
@ -1667,9 +1666,8 @@ impl<'a> TraitDef<'a> {
prefix: &str,
mutbl: ast::Mutability)
-> (P<ast::Pat>, Vec<(Span, Option<Ident>, P<Expr>, &'a [ast::Attribute])>) {
let variant_ident = variant.node.name;
let sp = variant.span.with_ctxt(self.span.ctxt());
let variant_path = cx.path(sp, vec![enum_ident, variant_ident]);
let variant_path = cx.path(sp, vec![enum_ident, variant.node.ident]);
let use_temporaries = false; // enums can't be repr(packed)
self.create_struct_pattern(cx, variant_path, &variant.node.data, prefix, mutbl,
use_temporaries)