user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #21161: japaric/ufcs-hash

Browse source 
expansion now uses `::std:#️⃣:Hash::hash(&*__self_0_0, __arg_0)` instead of
`(*__self_0_0).hash(__arg_0)`

closes #21160

r? @alexcrichton
This commit is contained in:
Alex Crichton 2015-01-15 14:11:58 -08:00
commit c3c47f5f55
5 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax/ext/deriving/hash.rs
View file

@ -65,9 +65,19 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure)
[ref state_expr] => state_expr,
_ => cx.span_bug(trait_span, "incorrect number of arguments in `deriving(Hash)`")
};
let hash_ident = substr.method_ident;
let call_hash = |&: span, thing_expr| {
let expr = cx.expr_method_call(span, thing_expr, hash_ident, vec!(state_expr.clone()));
let hash_path = {
let strs = vec![
cx.ident_of("std"),
cx.ident_of("hash"),
cx.ident_of("Hash"),
cx.ident_of("hash"),
];
cx.expr_path(cx.path_global(span, strs))
};
let ref_thing = cx.expr_addr_of(span, thing_expr);
let expr = cx.expr_call(span, hash_path, vec!(ref_thing, state_expr.clone()));
cx.stmt_expr(expr)
};
let mut stmts = Vec::new();