diff options
| author | Florian Diebold <[email protected]> | 2020-02-16 11:57:19 +0000 |
|---|---|---|
| committer | Florian Diebold <[email protected]> | 2020-02-16 11:58:20 +0000 |
| commit | e14e7ffa34bf9a458681fe7490ac2d51b02ff908 (patch) | |
| tree | 705799ffbe43935243c512eaaecf942d721c42f0 /crates/ra_hir_ty/src/infer | |
| parent | 617b5b3b31cf0b461829810640e28a9090a5b957 (diff) | |
Fix coercion of &T to itself
The autoderef coercion logic did not handle matching placeholders. This led to
some type mismatches.
Diffstat (limited to 'crates/ra_hir_ty/src/infer')
| -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))) |