diff options
Diffstat (limited to 'crates/ra_hir/src/ty/lower.rs')
-rw-r--r-- | crates/ra_hir/src/ty/lower.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index 8ea2806dd..e477b2439 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs | |||
@@ -12,6 +12,7 @@ use hir_def::{ | |||
12 | builtin_type::{BuiltinFloat, BuiltinInt, BuiltinType}, | 12 | builtin_type::{BuiltinFloat, BuiltinInt, BuiltinType}, |
13 | path::{GenericArg, PathSegment}, | 13 | path::{GenericArg, PathSegment}, |
14 | type_ref::{TypeBound, TypeRef}, | 14 | type_ref::{TypeBound, TypeRef}, |
15 | GenericDefId, | ||
15 | }; | 16 | }; |
16 | 17 | ||
17 | use super::{ | 18 | use super::{ |
@@ -574,7 +575,7 @@ pub(crate) fn generic_predicates_for_param_query( | |||
574 | def: GenericDef, | 575 | def: GenericDef, |
575 | param_idx: u32, | 576 | param_idx: u32, |
576 | ) -> Arc<[GenericPredicate]> { | 577 | ) -> Arc<[GenericPredicate]> { |
577 | let resolver = def.resolver(db); | 578 | let resolver = GenericDefId::from(def).resolver(db); |
578 | resolver | 579 | resolver |
579 | .where_predicates_in_scope() | 580 | .where_predicates_in_scope() |
580 | // we have to filter out all other predicates *first*, before attempting to lower them | 581 | // we have to filter out all other predicates *first*, before attempting to lower them |
@@ -600,7 +601,7 @@ pub(crate) fn generic_predicates_query( | |||
600 | db: &impl HirDatabase, | 601 | db: &impl HirDatabase, |
601 | def: GenericDef, | 602 | def: GenericDef, |
602 | ) -> Arc<[GenericPredicate]> { | 603 | ) -> Arc<[GenericPredicate]> { |
603 | let resolver = def.resolver(db); | 604 | let resolver = GenericDefId::from(def).resolver(db); |
604 | resolver | 605 | resolver |
605 | .where_predicates_in_scope() | 606 | .where_predicates_in_scope() |
606 | .flat_map(|pred| GenericPredicate::from_where_predicate(db, &resolver, pred)) | 607 | .flat_map(|pred| GenericPredicate::from_where_predicate(db, &resolver, pred)) |
@@ -609,7 +610,7 @@ pub(crate) fn generic_predicates_query( | |||
609 | 610 | ||
610 | /// Resolve the default type params from generics | 611 | /// Resolve the default type params from generics |
611 | pub(crate) fn generic_defaults_query(db: &impl HirDatabase, def: GenericDef) -> Substs { | 612 | pub(crate) fn generic_defaults_query(db: &impl HirDatabase, def: GenericDef) -> Substs { |
612 | let resolver = def.resolver(db); | 613 | let resolver = GenericDefId::from(def).resolver(db); |
613 | let generic_params = def.generic_params(db); | 614 | let generic_params = def.generic_params(db); |
614 | 615 | ||
615 | let defaults = generic_params | 616 | let defaults = generic_params |