From 50e01d2bc7429d718e0783d75458a6a047ee2b70 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 1 Mar 2021 21:57:39 +0100 Subject: Use chalk_ir::AdtId --- crates/hir/src/code_model.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index fc1a74641..7656db974 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs @@ -1700,7 +1700,7 @@ impl Type { pub fn is_packed(&self, db: &dyn HirDatabase) -> bool { let adt_id = match self.ty.value { - Ty::Adt(adt_id, ..) => adt_id, + Ty::Adt(hir_ty::AdtId(adt_id), ..) => adt_id, _ => return false, }; @@ -1728,8 +1728,8 @@ impl Type { pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(Field, Type)> { let (variant_id, substs) = match self.ty.value { - Ty::Adt(AdtId::StructId(s), ref substs) => (s.into(), substs), - Ty::Adt(AdtId::UnionId(u), ref substs) => (u.into(), substs), + Ty::Adt(hir_ty::AdtId(AdtId::StructId(s)), ref substs) => (s.into(), substs), + Ty::Adt(hir_ty::AdtId(AdtId::UnionId(u)), ref substs) => (u.into(), substs), _ => return Vec::new(), }; -- cgit v1.2.3