mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #4178 - matthiaskrgr:rustup_6, r=oli-obk

Browse Source 
rustup https://github.com/rust-lang/rust/pull/57428/

changelog: none
This commit is contained in:
bors 2019-06-06 07:28:10 +00:00
commit 46d7a0d2b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@ fn eq_path_parameters(&mut self, left: &GenericArgs, right: &GenericArgs) -> boo
&& 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 {
@ -299,7 +299,7 @@ pub fn eq_ty_kind(&mut self, left: &TyKind, right: &TyKind) -> bool {
}
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())
}
}