Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/builtin_derive.rs')
-rw-r--r--crates/hir-ty/src/builtin_derive.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/hir-ty/src/builtin_derive.rs b/crates/hir-ty/src/builtin_derive.rs
index 928e3da6e8..65a910555d 100644
--- a/crates/hir-ty/src/builtin_derive.rs
+++ b/crates/hir-ty/src/builtin_derive.rs
@@ -17,12 +17,11 @@ use rustc_type_ir::{
};
use crate::{
- GenericPredicates,
+ FieldType, GenericPredicates,
db::HirDatabase,
next_solver::{
AliasTy, Clause, Clauses, DbInterner, EarlyBinder, GenericArgs, ParamEnv,
- StoredEarlyBinder, StoredTy, TraitRef, Ty, TyKind, Unnormalized, fold::fold_tys,
- generics::Generics,
+ StoredEarlyBinder, TraitRef, Ty, TyKind, Unnormalized, fold::fold_tys, generics::Generics,
},
};
@@ -333,7 +332,7 @@ fn simple_trait_predicates<'db>(
fn extend_assoc_type_bounds<'db>(
interner: DbInterner<'db>,
assoc_type_bounds: &mut Vec<Clause<'db>>,
- fields: &ArenaMap<LocalFieldId, StoredEarlyBinder<StoredTy>>,
+ fields: &ArenaMap<LocalFieldId, FieldType>,
trait_id: TraitId,
trait_: BuiltinDeriveImplTrait,
) {
@@ -365,7 +364,7 @@ fn extend_assoc_type_bounds<'db>(
let mut visitor = ProjectionFinder { interner, assoc_type_bounds, trait_id, trait_ };
for (_, field) in fields.iter() {
- field.get().instantiate_identity().skip_norm_wip().visit_with(&mut visitor);
+ field.ty().instantiate_identity().skip_norm_wip().visit_with(&mut visitor);
}
}