diff options
author | Florian Diebold <[email protected]> | 2019-02-24 20:36:49 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-02-24 20:36:49 +0000 |
commit | bd8ed644e4362785b079ba9fbe2d4e490a678d27 (patch) | |
tree | e87434ec26daadf0c3d1f8486391d6c183b29c49 /crates/ra_hir/src/ty/infer.rs | |
parent | 61d961263387f7293f3d0c4d7b8c8c9a07959ced (diff) |
Rename Type => TypeAlias
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 29331bea5..921130b71 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -406,7 +406,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
406 | crate::ImplItem::Const(_) => None, | 406 | crate::ImplItem::Const(_) => None, |
407 | 407 | ||
408 | // TODO: Resolve associated types | 408 | // TODO: Resolve associated types |
409 | crate::ImplItem::Type(_) => None, | 409 | crate::ImplItem::TypeAlias(_) => None, |
410 | })?; | 410 | })?; |
411 | resolved = Resolution::Def(item.into()); | 411 | resolved = Resolution::Def(item.into()); |
412 | } | 412 | } |
@@ -477,7 +477,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
477 | let ty = self.insert_type_vars(ty.apply_substs(substs)); | 477 | let ty = self.insert_type_vars(ty.apply_substs(substs)); |
478 | (ty, Some(var.into())) | 478 | (ty, Some(var.into())) |
479 | } | 479 | } |
480 | TypableDef::Type(_) | TypableDef::Function(_) | TypableDef::Enum(_) => { | 480 | TypableDef::TypeAlias(_) | TypableDef::Function(_) | TypableDef::Enum(_) => { |
481 | (Ty::Unknown, None) | 481 | (Ty::Unknown, None) |
482 | } | 482 | } |
483 | } | 483 | } |