diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-06 09:52:02 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-04-06 09:52:02 +0100 |
| commit | 047b5313013383fc4fafaef6d6d8d6a64549e3cb (patch) | |
| tree | f4951c835dd6f4840ae02ba5c06d5da44aedae94 /crates/hir_ty/src/infer/unify.rs | |
| parent | 4bc8a018302d53951ae855ba57d07095a16ef182 (diff) | |
| parent | 08dc69599efb4961319c0118b789d3abb264b7fa (diff) | |
Merge #8359
8359: Add Lifetime to TyKind::Ref and DynTy r=flodiebold a=Veykril
CC #8313
Co-authored-by: Lukas Wirth <[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 2f9523325..c7878ebfd 100644 --- a/crates/hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
| @@ -317,7 +317,7 @@ impl InferenceTable { | |||
| 317 | | (TyKind::Closure(.., substs1), TyKind::Closure(.., substs2)) => { | 317 | | (TyKind::Closure(.., substs1), TyKind::Closure(.., substs2)) => { |
| 318 | self.unify_substs(substs1, substs2, depth + 1) | 318 | self.unify_substs(substs1, substs2, depth + 1) |
| 319 | } | 319 | } |
| 320 | (TyKind::Ref(_, ty1), TyKind::Ref(_, ty2)) | 320 | (TyKind::Ref(_, _, ty1), TyKind::Ref(_, _, ty2)) |
| 321 | | (TyKind::Raw(_, ty1), TyKind::Raw(_, ty2)) | 321 | | (TyKind::Raw(_, ty1), TyKind::Raw(_, ty2)) |
| 322 | | (TyKind::Array(ty1), TyKind::Array(ty2)) | 322 | | (TyKind::Array(ty1), TyKind::Array(ty2)) |
| 323 | | (TyKind::Slice(ty1), TyKind::Slice(ty2)) => self.unify_inner(ty1, ty2, depth + 1), | 323 | | (TyKind::Slice(ty1), TyKind::Slice(ty2)) => self.unify_inner(ty1, ty2, depth + 1), |