Skip to content

Commit acff39e

Browse files
committed
---
yaml --- r: 209578 b: refs/heads/try c: ed437cd h: refs/heads/master v: v3
1 parent 3c2f7e0 commit acff39e

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 01e56942a087d9eb7e4cb6d2f80548852171d658
5+
refs/heads/try: ed437cd8fcbb9ee89849a7eafff94ea97252189e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/ext/deriving/cmp/eq.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@ pub fn expand_deriving_eq(cx: &mut ExtCtxt,
2424
push: &mut FnMut(P<Item>))
2525
{
2626
fn cs_total_eq_assert(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> P<Expr> {
27-
cs_same_method(|cx, span, exprs| {
28-
// create `a.<method>(); b.<method>(); c.<method>(); ...`
29-
// (where method is `assert_receiver_is_total_eq`)
30-
let stmts = exprs.into_iter().map(|e| cx.stmt_expr(e)).collect();
31-
let block = cx.block(span, stmts, None);
32-
cx.expr_block(block)
33-
},
34-
Box::new(|cx, sp, _, _| {
35-
cx.span_bug(sp, "non matching enums in derive(Eq)?") }),
36-
cx,
37-
span,
38-
substr)
27+
cs_same_method(
28+
|cx, span, exprs| {
29+
// create `a.<method>(); b.<method>(); c.<method>(); ...`
30+
// (where method is `assert_receiver_is_total_eq`)
31+
let stmts = exprs.into_iter().map(|e| cx.stmt_expr(e)).collect();
32+
let block = cx.block(span, stmts, None);
33+
cx.expr_block(block)
34+
},
35+
Box::new(|cx, sp, _, _| {
36+
cx.span_bug(sp, "non matching enums in derive(Eq)?") }),
37+
cx,
38+
span,
39+
substr
40+
)
3941
}
4042

4143
let inline = cx.meta_word(span, InternedString::new("inline"));

0 commit comments

Comments
 (0)