rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rustup to 2018-05-16

Browse Source
This commit is contained in:
Mateusz Mikuła
2018-05-17 11:21:15 +02:00
committed by Mateusz Mikuła
parent 1af2f20da6
commit f0c823a85e
25 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clippy_lints/src/utils/hir_utils.rs
View File

@@ -79,7 +79,7 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
(&ExprAssignOp(ref lo, ref ll, ref lr), &ExprAssignOp(ref ro, ref rl, ref rr)) => {
lo.node == ro.node && self.eq_expr(ll, rl) && self.eq_expr(lr, rr)
},
(&ExprBlock(ref l), &ExprBlock(ref r)) => self.eq_block(l, r),
(&ExprBlock(ref l, _), &ExprBlock(ref r, _)) => self.eq_block(l, r),
(&ExprBinary(l_op, ref ll, ref lr), &ExprBinary(r_op, ref rl, ref rr)) => {
l_op.node == r_op.node && self.eq_expr(ll, rl) && self.eq_expr(lr, rr)
|| swap_binop(l_op.node, ll, lr).map_or(false, |(l_op, ll, lr)| {
@@ -353,8 +353,8 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> {
self.hash_expr(l);
self.hash_expr(r);
},
ExprBlock(ref b) => {
let c: fn(_) -> _ = ExprBlock;
ExprBlock(ref b, _) => {
let c: fn(_, _) -> _ = ExprBlock;
c.hash(&mut self.s);
self.hash_block(b);
},