language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use chalk_ir::AdtId

Browse source
This commit is contained in:
Lukas Wirth 2021-03-01 21:57:39 +01:00
parent 16a76aa158
commit 50e01d2bc7
11 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir/src/code_model.rs
View file

@ -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(),
};