diff options
| author | Dmitry <[email protected]> | 2020-02-16 17:36:48 +0000 |
|---|---|---|
| committer | Dmitry <[email protected]> | 2020-02-16 17:36:48 +0000 |
| commit | 58e15d12e4211306273b0128cb4a80b552889543 (patch) | |
| tree | 70e129b7cd76c55d5cb86f9b084db001f73a2003 /crates/ra_hir_ty/src/infer/unify.rs | |
| parent | b446384956243ce6bdcef2a869123a2605e597ed (diff) | |
| parent | 742b3b5744fbca1a5587e2898cd5b74d55853a47 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'crates/ra_hir_ty/src/infer/unify.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/infer/unify.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_hir_ty/src/infer/unify.rs b/crates/ra_hir_ty/src/infer/unify.rs index fe05642ae..1dc842f40 100644 --- a/crates/ra_hir_ty/src/infer/unify.rs +++ b/crates/ra_hir_ty/src/infer/unify.rs | |||
| @@ -249,6 +249,8 @@ impl InferenceTable { | |||
| 249 | match (ty1, ty2) { | 249 | match (ty1, ty2) { |
| 250 | (Ty::Unknown, _) | (_, Ty::Unknown) => true, | 250 | (Ty::Unknown, _) | (_, Ty::Unknown) => true, |
| 251 | 251 | ||
| 252 | (Ty::Placeholder(p1), Ty::Placeholder(p2)) if *p1 == *p2 => true, | ||
| 253 | |||
| 252 | (Ty::Infer(InferTy::TypeVar(tv1)), Ty::Infer(InferTy::TypeVar(tv2))) | 254 | (Ty::Infer(InferTy::TypeVar(tv1)), Ty::Infer(InferTy::TypeVar(tv2))) |
| 253 | | (Ty::Infer(InferTy::IntVar(tv1)), Ty::Infer(InferTy::IntVar(tv2))) | 255 | | (Ty::Infer(InferTy::IntVar(tv1)), Ty::Infer(InferTy::IntVar(tv2))) |
| 254 | | (Ty::Infer(InferTy::FloatVar(tv1)), Ty::Infer(InferTy::FloatVar(tv2))) | 256 | | (Ty::Infer(InferTy::FloatVar(tv1)), Ty::Infer(InferTy::FloatVar(tv2))) |