diff options
| author | uHOOCCOOHu <[email protected]> | 2019-09-17 20:59:51 +0100 |
|---|---|---|
| committer | uHOOCCOOHu <[email protected]> | 2019-09-25 23:04:43 +0100 |
| commit | bf161fa3e58d57d9b15bd965405036d834f18595 (patch) | |
| tree | 62f7103143462ed75544985b7c3ad0cb2ddda96b /crates/ra_hir/src/ty/infer | |
| parent | 4bb66df6de6a832f53f09128ea038fc1c0068515 (diff) | |
Better handle never type and branch merging
Split out tests for never type to another file
Diffstat (limited to 'crates/ra_hir/src/ty/infer')
| -rw-r--r-- | crates/ra_hir/src/ty/infer/unify.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs index 9a0d2d8f9..b6ebee3b1 100644 --- a/crates/ra_hir/src/ty/infer/unify.rs +++ b/crates/ra_hir/src/ty/infer/unify.rs | |||
| @@ -63,6 +63,7 @@ where | |||
| 63 | InferTy::TypeVar(_) => InferTy::TypeVar(root), | 63 | InferTy::TypeVar(_) => InferTy::TypeVar(root), |
| 64 | InferTy::IntVar(_) => InferTy::IntVar(root), | 64 | InferTy::IntVar(_) => InferTy::IntVar(root), |
| 65 | InferTy::FloatVar(_) => InferTy::FloatVar(root), | 65 | InferTy::FloatVar(_) => InferTy::FloatVar(root), |
| 66 | InferTy::MaybeNeverTypeVar(_) => InferTy::MaybeNeverTypeVar(root), | ||
| 66 | }; | 67 | }; |
| 67 | let position = self.add(free_var); | 68 | let position = self.add(free_var); |
| 68 | Ty::Bound(position as u32) | 69 | Ty::Bound(position as u32) |