Skip to content

Commit

Permalink
Auto merge of #4178 - matthiaskrgr:rustup_6, r=oli-obk
Browse files Browse the repository at this point in the history
rustup rust-lang/rust#57428

changelog: none
  • Loading branch information
bors committed Jun 6, 2019
2 parents 42f96b2 + d0ca098 commit 46d7a0d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions clippy_lints/src/utils/hir_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
&& over(&left.bindings, &right.bindings, |l, r| self.eq_type_binding(l, r))
} else if left.parenthesized && right.parenthesized {
over(left.inputs(), right.inputs(), |l, r| self.eq_ty(l, r))
&& both(&Some(&left.bindings[0].ty), &Some(&right.bindings[0].ty), |l, r| {
&& both(&Some(&left.bindings[0].ty()), &Some(&right.bindings[0].ty()), |l, r| {
self.eq_ty(l, r)
})
} else {
Expand Down Expand Up @@ -299,7 +299,7 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
}

fn eq_type_binding(&mut self, left: &TypeBinding, right: &TypeBinding) -> bool {
left.ident.name == right.ident.name && self.eq_ty(&left.ty, &right.ty)
left.ident.name == right.ident.name && self.eq_ty(&left.ty(), &right.ty())
}
}

Expand Down

0 comments on commit 46d7a0d

Please sign in to comment.