diff options
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
-rw-r--r-- | crates/ra_hir/src/ty.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index a3df08827..375850b92 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -16,7 +16,7 @@ use std::ops::Deref; | |||
16 | use std::sync::Arc; | 16 | use std::sync::Arc; |
17 | use std::{fmt, mem}; | 17 | use std::{fmt, mem}; |
18 | 18 | ||
19 | use crate::{db::HirDatabase, type_ref::Mutability, AdtDef, GenericParams, Name, Trait, TypeAlias}; | 19 | use crate::{db::HirDatabase, type_ref::Mutability, Adt, GenericParams, Name, Trait, TypeAlias}; |
20 | use display::{HirDisplay, HirFormatter}; | 20 | use display::{HirDisplay, HirFormatter}; |
21 | 21 | ||
22 | pub(crate) use autoderef::autoderef; | 22 | pub(crate) use autoderef::autoderef; |
@@ -47,7 +47,7 @@ pub enum TypeCtor { | |||
47 | Float(primitive::UncertainFloatTy), | 47 | Float(primitive::UncertainFloatTy), |
48 | 48 | ||
49 | /// Structures, enumerations and unions. | 49 | /// Structures, enumerations and unions. |
50 | Adt(AdtDef), | 50 | Adt(Adt), |
51 | 51 | ||
52 | /// The pointee of a string slice. Written as `str`. | 52 | /// The pointee of a string slice. Written as `str`. |
53 | Str, | 53 | Str, |
@@ -458,7 +458,7 @@ impl Ty { | |||
458 | } | 458 | } |
459 | } | 459 | } |
460 | 460 | ||
461 | pub fn as_adt(&self) -> Option<(AdtDef, &Substs)> { | 461 | pub fn as_adt(&self) -> Option<(Adt, &Substs)> { |
462 | match self { | 462 | match self { |
463 | Ty::Apply(ApplicationTy { ctor: TypeCtor::Adt(adt_def), parameters }) => { | 463 | Ty::Apply(ApplicationTy { ctor: TypeCtor::Adt(adt_def), parameters }) => { |
464 | Some((*adt_def, parameters)) | 464 | Some((*adt_def, parameters)) |
@@ -726,9 +726,9 @@ impl HirDisplay for ApplicationTy { | |||
726 | } | 726 | } |
727 | TypeCtor::Adt(def_id) => { | 727 | TypeCtor::Adt(def_id) => { |
728 | let name = match def_id { | 728 | let name = match def_id { |
729 | AdtDef::Struct(s) => s.name(f.db), | 729 | Adt::Struct(s) => s.name(f.db), |
730 | AdtDef::Union(u) => u.name(f.db), | 730 | Adt::Union(u) => u.name(f.db), |
731 | AdtDef::Enum(e) => e.name(f.db), | 731 | Adt::Enum(e) => e.name(f.db), |
732 | } | 732 | } |
733 | .unwrap_or_else(Name::missing); | 733 | .unwrap_or_else(Name::missing); |
734 | write!(f, "{}", name)?; | 734 | write!(f, "{}", name)?; |