half work: upgrade chalk

Author: ChayimFriedman2

Cargo.lock

@@ -35,10 +35,10 @@ debug = 2
 [patch.'crates-io']
 # rowan = { path = "../rowan" }
 
-# chalk-solve = { path = "../chalk/chalk-solve" }
-# chalk-ir = { path = "../chalk/chalk-ir" }
-# chalk-recursive = { path = "../chalk/chalk-recursive" }
-# chalk-derive = { path = "../chalk/chalk-derive" }
+chalk-solve = { path = "../chalk/chalk-solve" }
+chalk-ir = { path = "../chalk/chalk-ir" }
+chalk-recursive = { path = "../chalk/chalk-recursive" }
+chalk-derive = { path = "../chalk/chalk-derive" }
 # line-index = { path = "lib/line-index" }
 # la-arena = { path = "lib/la-arena" }
 # lsp-server = { path = "lib/lsp-server" }
@@ -105,10 +105,10 @@ arrayvec = "0.7.4"
 bitflags = "2.4.1"
 cargo_metadata = "0.18.1"
 camino = "1.1.6"
-chalk-solve = { version = "0.100.0", default-features = false }
-chalk-ir = "0.100.0"
-chalk-recursive = { version = "0.100.0", default-features = false }
-chalk-derive = "0.100.0"
+chalk-solve = { version = "0.101.0-dev.0", default-features = false }
+chalk-ir = "0.101.0-dev.0"
+chalk-recursive = { version = "0.101.0-dev.0", default-features = false }
+chalk-derive = "0.101.0-dev.0"
 crossbeam-channel = "0.5.8"
 dissimilar = "1.0.7"
 dot = "0.1.4"

Cargo.toml

@@ -66,6 +66,25 @@ pub(crate) type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>;
 pub(crate) type Variances = chalk_ir::Variances<Interner>;
 
 impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> {
+    fn associated_ty_matches(
+        &self,
+        trait_item: AssocTypeId,
+        impl_item: AssociatedTyValueId,
+    ) -> bool {
+        let trait_item = from_assoc_type_id(self.db, trait_item);
+        let impl_item = from_assoc_type_value_id(self.db, impl_item);
+        match (trait_item, impl_item) {
+            (AnyTraitAssocType::Normal(impl_item), AnyImplAssocType::Normal(trait_item)) => {
+                let trait_assoc = self.db.type_alias_data(trait_item);
+                let impl_assoc = self.db.type_alias_data(impl_item);
+                trait_assoc.name == impl_assoc.name
+            }
+            (AnyTraitAssocType::Rpitit(trait_item), AnyImplAssocType::Rpitit(impl_item)) => {
+                impl_item.loc(self.db).trait_assoc == trait_item
+            }
+            _ => false,
+        }
+    }
     fn associated_ty_data(&self, id: AssocTypeId) -> Arc<AssociatedTyDatum> {
         self.db.associated_ty_data(id)
     }