aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty/src/traits
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r--crates/ra_hir_ty/src/traits/chalk.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs
index fc21872b2..6a31014d8 100644
--- a/crates/ra_hir_ty/src/traits/chalk.rs
+++ b/crates/ra_hir_ty/src/traits/chalk.rs
@@ -9,7 +9,7 @@ use chalk_ir::{
9}; 9};
10use chalk_rust_ir::{AssociatedTyDatum, AssociatedTyValue, ImplDatum, StructDatum, TraitDatum}; 10use chalk_rust_ir::{AssociatedTyDatum, AssociatedTyValue, ImplDatum, StructDatum, TraitDatum};
11 11
12use hir_def::{AssocItemId, ContainerId, GenericDefId, ImplId, Lookup, TraitId, TypeAliasId}; 12use hir_def::{AssocContainerId, AssocItemId, GenericDefId, ImplId, Lookup, TraitId, TypeAliasId};
13use ra_db::{ 13use ra_db::{
14 salsa::{InternId, InternKey}, 14 salsa::{InternId, InternKey},
15 CrateId, 15 CrateId,
@@ -542,7 +542,7 @@ pub(crate) fn associated_ty_data_query(
542 debug!("associated_ty_data {:?}", id); 542 debug!("associated_ty_data {:?}", id);
543 let type_alias: TypeAliasId = from_chalk(db, id); 543 let type_alias: TypeAliasId = from_chalk(db, id);
544 let trait_ = match type_alias.lookup(db).container { 544 let trait_ = match type_alias.lookup(db).container {
545 ContainerId::TraitId(t) => t, 545 AssocContainerId::TraitId(t) => t,
546 _ => panic!("associated type not in trait"), 546 _ => panic!("associated type not in trait"),
547 }; 547 };
548 let generic_params = generics(db, type_alias.into()); 548 let generic_params = generics(db, type_alias.into());
@@ -755,7 +755,7 @@ fn type_alias_associated_ty_value(
755) -> Arc<AssociatedTyValue<ChalkIr>> { 755) -> Arc<AssociatedTyValue<ChalkIr>> {
756 let type_alias_data = db.type_alias_data(type_alias); 756 let type_alias_data = db.type_alias_data(type_alias);
757 let impl_id = match type_alias.lookup(db).container { 757 let impl_id = match type_alias.lookup(db).container {
758 ContainerId::ImplId(it) => it, 758 AssocContainerId::ImplId(it) => it,
759 _ => panic!("assoc ty value should be in impl"), 759 _ => panic!("assoc ty value should be in impl"),
760 }; 760 };
761 761