diff options
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 3970c49e3..540a99b15 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -48,7 +48,7 @@ use crate::{ | |||
48 | resolve::{Resolution, Resolver}, | 48 | resolve::{Resolution, Resolver}, |
49 | ty::infer::diagnostics::InferenceDiagnostic, | 49 | ty::infer::diagnostics::InferenceDiagnostic, |
50 | type_ref::{Mutability, TypeRef}, | 50 | type_ref::{Mutability, TypeRef}, |
51 | AdtDef, ConstData, DefWithBody, FnData, Function, HasBody, ImplItem, ModuleDef, Name, Path, | 51 | Adt, ConstData, DefWithBody, FnData, Function, HasBody, ImplItem, ModuleDef, Name, Path, |
52 | StructField, | 52 | StructField, |
53 | }; | 53 | }; |
54 | 54 | ||
@@ -668,7 +668,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
668 | // FIXME remove the duplication between here and `Ty::from_path`? | 668 | // FIXME remove the duplication between here and `Ty::from_path`? |
669 | let substs = Ty::substs_from_path(self.db, resolver, path, def); | 669 | let substs = Ty::substs_from_path(self.db, resolver, path, def); |
670 | match def { | 670 | match def { |
671 | TypableDef::Struct(s) => { | 671 | TypableDef::Adt(Adt::Struct(s)) => { |
672 | let ty = s.ty(self.db); | 672 | let ty = s.ty(self.db); |
673 | let ty = self.insert_type_vars(ty.apply_substs(substs)); | 673 | let ty = self.insert_type_vars(ty.apply_substs(substs)); |
674 | (ty, Some(s.into())) | 674 | (ty, Some(s.into())) |
@@ -678,10 +678,10 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
678 | let ty = self.insert_type_vars(ty.apply_substs(substs)); | 678 | let ty = self.insert_type_vars(ty.apply_substs(substs)); |
679 | (ty, Some(var.into())) | 679 | (ty, Some(var.into())) |
680 | } | 680 | } |
681 | TypableDef::Union(_) | 681 | TypableDef::Adt(Adt::Enum(_)) |
682 | | TypableDef::Adt(Adt::Union(_)) | ||
682 | | TypableDef::TypeAlias(_) | 683 | | TypableDef::TypeAlias(_) |
683 | | TypableDef::Function(_) | 684 | | TypableDef::Function(_) |
684 | | TypableDef::Enum(_) | ||
685 | | TypableDef::Const(_) | 685 | | TypableDef::Const(_) |
686 | | TypableDef::Static(_) | 686 | | TypableDef::Static(_) |
687 | | TypableDef::BuiltinType(_) => (Ty::Unknown, None), | 687 | | TypableDef::BuiltinType(_) => (Ty::Unknown, None), |
@@ -1185,7 +1185,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1185 | let i = name.to_string().parse::<usize>().ok(); | 1185 | let i = name.to_string().parse::<usize>().ok(); |
1186 | i.and_then(|i| a_ty.parameters.0.get(i).cloned()) | 1186 | i.and_then(|i| a_ty.parameters.0.get(i).cloned()) |
1187 | } | 1187 | } |
1188 | TypeCtor::Adt(AdtDef::Struct(s)) => s.field(self.db, name).map(|field| { | 1188 | TypeCtor::Adt(Adt::Struct(s)) => s.field(self.db, name).map(|field| { |
1189 | self.write_field_resolution(tgt_expr, field); | 1189 | self.write_field_resolution(tgt_expr, field); |
1190 | field.ty(self.db).subst(&a_ty.parameters) | 1190 | field.ty(self.db).subst(&a_ty.parameters) |
1191 | }), | 1191 | }), |
@@ -1489,7 +1489,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1489 | trait_.associated_type_by_name(self.db, &name::OUTPUT) | 1489 | trait_.associated_type_by_name(self.db, &name::OUTPUT) |
1490 | } | 1490 | } |
1491 | 1491 | ||
1492 | fn resolve_boxed_box(&self) -> Option<AdtDef> { | 1492 | fn resolve_boxed_box(&self) -> Option<Adt> { |
1493 | let boxed_box_path = Path { | 1493 | let boxed_box_path = Path { |
1494 | kind: PathKind::Abs, | 1494 | kind: PathKind::Abs, |
1495 | segments: vec![ | 1495 | segments: vec![ |
@@ -1499,7 +1499,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1499 | ], | 1499 | ], |
1500 | }; | 1500 | }; |
1501 | let struct_ = self.resolver.resolve_known_struct(self.db, &boxed_box_path)?; | 1501 | let struct_ = self.resolver.resolve_known_struct(self.db, &boxed_box_path)?; |
1502 | Some(AdtDef::Struct(struct_)) | 1502 | Some(Adt::Struct(struct_)) |
1503 | } | 1503 | } |
1504 | } | 1504 | } |
1505 | 1505 | ||