diff options
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r-- | crates/ra_hir_ty/src/traits/builtin.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_ty/src/traits/builtin.rs b/crates/ra_hir_ty/src/traits/builtin.rs index cc0f3eeb4..03f9b4e27 100644 --- a/crates/ra_hir_ty/src/traits/builtin.rs +++ b/crates/ra_hir_ty/src/traits/builtin.rs | |||
@@ -96,7 +96,7 @@ fn get_builtin_unsize_impls( | |||
96 | 96 | ||
97 | pub(super) fn impl_datum(db: &impl HirDatabase, krate: CrateId, impl_: Impl) -> BuiltinImplData { | 97 | pub(super) fn impl_datum(db: &impl HirDatabase, krate: CrateId, impl_: Impl) -> BuiltinImplData { |
98 | match impl_ { | 98 | match impl_ { |
99 | Impl::ImplBlock(_) => unreachable!(), | 99 | Impl::ImplDef(_) => unreachable!(), |
100 | Impl::ClosureFnTraitImpl(data) => closure_fn_trait_impl_datum(db, krate, data), | 100 | Impl::ClosureFnTraitImpl(data) => closure_fn_trait_impl_datum(db, krate, data), |
101 | Impl::UnsizeArray => array_unsize_impl_datum(db, krate), | 101 | Impl::UnsizeArray => array_unsize_impl_datum(db, krate), |
102 | Impl::UnsizeToTraitObject(trait_) => trait_object_unsize_impl_datum(db, krate, trait_), | 102 | Impl::UnsizeToTraitObject(trait_) => trait_object_unsize_impl_datum(db, krate, trait_), |
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs index 5b6c1a62e..4001aa941 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/ra_hir_ty/src/traits/chalk.rs | |||
@@ -576,7 +576,7 @@ where | |||
576 | .impls_for_trait(self.krate, trait_) | 576 | .impls_for_trait(self.krate, trait_) |
577 | .iter() | 577 | .iter() |
578 | .copied() | 578 | .copied() |
579 | .map(Impl::ImplBlock) | 579 | .map(Impl::ImplDef) |
580 | .map(|impl_| impl_.to_chalk(self.db)) | 580 | .map(|impl_| impl_.to_chalk(self.db)) |
581 | .collect(); | 581 | .collect(); |
582 | 582 | ||
@@ -712,12 +712,12 @@ pub(crate) fn impl_datum_query( | |||
712 | debug!("impl_datum {:?}", impl_id); | 712 | debug!("impl_datum {:?}", impl_id); |
713 | let impl_: Impl = from_chalk(db, impl_id); | 713 | let impl_: Impl = from_chalk(db, impl_id); |
714 | match impl_ { | 714 | match impl_ { |
715 | Impl::ImplBlock(impl_block) => impl_block_datum(db, krate, impl_id, impl_block), | 715 | Impl::ImplDef(impl_def) => impl_def_datum(db, krate, impl_id, impl_def), |
716 | _ => Arc::new(builtin::impl_datum(db, krate, impl_).to_chalk(db)), | 716 | _ => Arc::new(builtin::impl_datum(db, krate, impl_).to_chalk(db)), |
717 | } | 717 | } |
718 | } | 718 | } |
719 | 719 | ||
720 | fn impl_block_datum( | 720 | fn impl_def_datum( |
721 | db: &impl HirDatabase, | 721 | db: &impl HirDatabase, |
722 | krate: CrateId, | 722 | krate: CrateId, |
723 | chalk_id: ImplId, | 723 | chalk_id: ImplId, |
@@ -815,7 +815,7 @@ fn type_alias_associated_ty_value( | |||
815 | let ty = db.ty(type_alias.into()); | 815 | let ty = db.ty(type_alias.into()); |
816 | let value_bound = chalk_rust_ir::AssociatedTyValueBound { ty: ty.value.to_chalk(db) }; | 816 | let value_bound = chalk_rust_ir::AssociatedTyValueBound { ty: ty.value.to_chalk(db) }; |
817 | let value = chalk_rust_ir::AssociatedTyValue { | 817 | let value = chalk_rust_ir::AssociatedTyValue { |
818 | impl_id: Impl::ImplBlock(impl_id).to_chalk(db), | 818 | impl_id: Impl::ImplDef(impl_id).to_chalk(db), |
819 | associated_ty_id: assoc_ty.to_chalk(db), | 819 | associated_ty_id: assoc_ty.to_chalk(db), |
820 | value: make_binders(value_bound, ty.num_binders), | 820 | value: make_binders(value_bound, ty.num_binders), |
821 | }; | 821 | }; |