diff options
| author | bors <bors@rust-lang.org> | 2016-10-28 10:20:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 10:20:55 -0700 |
| commit | 421b595f25e5dbab9c967afd03929d013f346322 (patch) | |
| tree | 0b59aec9588a4d629bf8ad15509f35d6ae33d9a1 /src/libsyntax_ext | |
| parent | 36d746718086dfcc12f73562b1996daf2f8ba643 (diff) | |
| parent | 61e765ad982c7b01753ebe9971b4ce407bbdb0d9 (diff) | |
| download | rust-421b595f25e5dbab9c967afd03929d013f346322.tar.gz rust-421b595f25e5dbab9c967afd03929d013f346322.zip | |
Auto merge of #37450 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests - Successful merges: #36206, #37343, #37430, #37436, #37441 - Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index bc47d8f4e61..687f8c902f2 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -1460,8 +1460,9 @@ impl<'a> MethodDef<'a> { .iter() .map(|v| { let ident = v.node.name; + let sp = Span { expn_id: trait_.span.expn_id, ..v.span }; let summary = trait_.summarise_struct(cx, &v.node.data); - (ident, v.span, summary) + (ident, sp, summary) }) .collect(); self.call_substructure_method(cx, |