rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix more spans in deriving::generic

Browse Source
This commit is contained in:
Nick Cameron
2016-10-29 11:18:30 +13:00
parent 16e1d36c08
commit c2c37b401e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsyntax_ext/deriving/generic/mod.rs
View File

@@ -1546,7 +1546,7 @@ impl<'a> TraitDef<'a> {
cx.span_bug(sp, "a braced struct with unnamed fields in `derive`"); cx.span_bug(sp, "a braced struct with unnamed fields in `derive`");
} }
codemap::Spanned { codemap::Spanned {
span: pat.span, span: Span { expn_id: self.span.expn_id, ..pat.span },
node: ast::FieldPat { node: ast::FieldPat {
ident: ident.unwrap(), ident: ident.unwrap(),
pat: pat, pat: pat,
@@ -1577,7 +1577,8 @@ impl<'a> TraitDef<'a> {
mutbl: ast::Mutability) mutbl: ast::Mutability)
-> (P<ast::Pat>, Vec<(Span, Option<Ident>, P<Expr>, &'a [ast::Attribute])>) { -> (P<ast::Pat>, Vec<(Span, Option<Ident>, P<Expr>, &'a [ast::Attribute])>) {
let variant_ident = variant.node.name; let variant_ident = variant.node.name;
let variant_path = cx.path(variant.span, vec![enum_ident, variant_ident]); let sp = Span { expn_id: self.span.expn_id, ..variant.span };
let variant_path = cx.path(sp, vec![enum_ident, variant_ident]);
self.create_struct_pattern(cx, variant_path, &variant.node.data, prefix, mutbl) self.create_struct_pattern(cx, variant_path, &variant.node.data, prefix, mutbl)
} }
} }