Skip to content

Commit c2c37b4

Browse files
committed
Fix more spans in deriving::generic
1 parent 16e1d36 commit c2c37b4

File tree

1 file changed

+3
-2
lines changed
  • src/libsyntax_ext/deriving/generic

1 file changed

+3
-2
lines changed

src/libsyntax_ext/deriving/generic/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ impl<'a> TraitDef<'a> {
15461546
cx.span_bug(sp, "a braced struct with unnamed fields in `derive`");
15471547
}
15481548
codemap::Spanned {
1549-
span: pat.span,
1549+
span: Span { expn_id: self.span.expn_id, ..pat.span },
15501550
node: ast::FieldPat {
15511551
ident: ident.unwrap(),
15521552
pat: pat,
@@ -1577,7 +1577,8 @@ impl<'a> TraitDef<'a> {
15771577
mutbl: ast::Mutability)
15781578
-> (P<ast::Pat>, Vec<(Span, Option<Ident>, P<Expr>, &'a [ast::Attribute])>) {
15791579
let variant_ident = variant.node.name;
1580-
let variant_path = cx.path(variant.span, vec![enum_ident, variant_ident]);
1580+
let sp = Span { expn_id: self.span.expn_id, ..variant.span };
1581+
let variant_path = cx.path(sp, vec![enum_ident, variant_ident]);
15811582
self.create_struct_pattern(cx, variant_path, &variant.node.data, prefix, mutbl)
15821583
}
15831584
}

0 commit comments

Comments
 (0)