From b035c314b4b0ecd2477fde216dbe7e8801f94d0d Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 13 Mar 2021 20:05:47 +0100 Subject: Use chalk_ir::OpaqueTyId --- crates/hir_ty/src/traits/chalk.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crates/hir_ty/src/traits/chalk.rs') diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index e7217bc11..1f3e1c07a 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs @@ -177,10 +177,9 @@ impl<'a> chalk_solve::RustIrDatabase for ChalkContext<'a> { } fn opaque_ty_data(&self, id: chalk_ir::OpaqueTyId) -> Arc { - let interned_id = crate::db::InternedOpaqueTyId::from(id); - let full_id = self.db.lookup_intern_impl_trait_id(interned_id); + let full_id = self.db.lookup_intern_impl_trait_id(id.into()); let bound = match full_id { - crate::OpaqueTyId::ReturnTypeImplTrait(func, idx) => { + crate::ImplTraitId::ReturnTypeImplTrait(func, idx) => { let datas = self .db .return_type_impl_traits(func) @@ -202,7 +201,7 @@ impl<'a> chalk_solve::RustIrDatabase for ChalkContext<'a> { let num_vars = datas.num_binders; make_binders(bound, num_vars) } - crate::OpaqueTyId::AsyncBlockTypeImplTrait(..) => { + crate::ImplTraitId::AsyncBlockTypeImplTrait(..) => { if let Some((future_trait, future_output)) = self .db .lang_item(self.krate, "future_trait".into()) -- cgit v1.2.3