From a430549aa6cb78e3a6c9258305b348743c4d7449 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 9 Mar 2021 18:27:16 +0100 Subject: Stop using `ContainerId` in `AssocContainerId` --- crates/hir_ty/src/infer/path.rs | 2 +- crates/hir_ty/src/method_resolution.rs | 2 +- crates/hir_ty/src/utils.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/hir_ty') diff --git a/crates/hir_ty/src/infer/path.rs b/crates/hir_ty/src/infer/path.rs index 5d541104e..ae3554bac 100644 --- a/crates/hir_ty/src/infer/path.rs +++ b/crates/hir_ty/src/infer/path.rs @@ -260,7 +260,7 @@ impl<'a> InferenceContext<'a> { })); Some(trait_substs) } - AssocContainerId::ContainerId(_) => None, + AssocContainerId::ModuleId(_) => None, }; self.write_assoc_resolution(id, item); diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs index 24db33c49..248367267 100644 --- a/crates/hir_ty/src/method_resolution.rs +++ b/crates/hir_ty/src/method_resolution.rs @@ -715,7 +715,7 @@ fn transform_receiver_ty( .fill_with_unknown() .build() } - AssocContainerId::ContainerId(_) => unreachable!(), + AssocContainerId::ModuleId(_) => unreachable!(), }; let sig = db.callable_item_signature(function_id.into()); Some(sig.value.params()[0].clone().subst_bound_vars(&substs)) diff --git a/crates/hir_ty/src/utils.rs b/crates/hir_ty/src/utils.rs index 65b79df0d..7351e4e54 100644 --- a/crates/hir_ty/src/utils.rs +++ b/crates/hir_ty/src/utils.rs @@ -259,6 +259,6 @@ fn parent_generic_def(db: &dyn DefDatabase, def: GenericDefId) -> Option Some(it.into()), AssocContainerId::TraitId(it) => Some(it.into()), - AssocContainerId::ContainerId(_) => None, + AssocContainerId::ModuleId(_) => None, } } -- cgit v1.2.3