diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-15 18:14:49 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-15 18:14:49 +0000 |
commit | e24453c5ee46546b0852c15500d51f77b10a7a6f (patch) | |
tree | c16545d4bcb98ccea98adf135dfba956edc13ffe /crates/hir_ty/src/infer/unify.rs | |
parent | d38fd77845c40c6f07507c5c436af903a452efbd (diff) | |
parent | 287e9a870c90650f2779c25de498602782a0f683 (diff) |
Merge #8038
8038: Fix unification logic r=flodiebold a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer/unify.rs')
-rw-r--r-- | crates/hir_ty/src/infer/unify.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs index 66f8fe8a3..7795f446f 100644 --- a/crates/hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
@@ -300,7 +300,7 @@ impl InferenceTable { | |||
300 | | (TyKind::Raw(_, ty1), TyKind::Raw(_, ty2)) | 300 | | (TyKind::Raw(_, ty1), TyKind::Raw(_, ty2)) |
301 | | (TyKind::Array(ty1), TyKind::Array(ty2)) | 301 | | (TyKind::Array(ty1), TyKind::Array(ty2)) |
302 | | (TyKind::Slice(ty1), TyKind::Slice(ty2)) => self.unify_inner(ty1, ty2, depth + 1), | 302 | | (TyKind::Slice(ty1), TyKind::Slice(ty2)) => self.unify_inner(ty1, ty2, depth + 1), |
303 | _ => false, | 303 | _ => true, /* we checked equals_ctor already */ |
304 | } | 304 | } |
305 | } else { | 305 | } else { |
306 | self.unify_inner_trivial(&ty1, &ty2, depth) | 306 | self.unify_inner_trivial(&ty1, &ty2, depth) |