about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-30 01:40:11 +0000
committerbors <bors@rust-lang.org>2017-07-30 01:40:11 +0000
commit5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9 (patch)
tree1efdfb555e8266e747a7e2c453d0ff84d5613c90 /src/libsyntax_ext
parent53bf7903fa7ebabca85f5937667956177989e345 (diff)
parent16c3fd9f3d3dd6667c1966d6a62e56bf9deed0fd (diff)
downloadrust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.tar.gz
rust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.zip
Auto merge of #43551 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests

- Successful merges: #43409, #43501, #43509, #43512, #43513, #43536, #43544, #43549
- Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/deriving/generic/ty.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs
index 9c89f99cbb5..f5ac1743920 100644
--- a/src/libsyntax_ext/deriving/generic/ty.rs
+++ b/src/libsyntax_ext/deriving/generic/ty.rs
@@ -216,6 +216,7 @@ fn mk_generics(lifetimes: Vec<ast::LifetimeDef>, ty_params: Vec<ast::TyParam>, s
         where_clause: ast::WhereClause {
             id: ast::DUMMY_NODE_ID,
             predicates: Vec::new(),
+            span: span,
         },
         span: span,
     }