diff --git a/Cargo.lock b/Cargo.lock index 49022502d9..a1786d201e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,9 +162,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chalk-derive" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6696d18587b7470c1e357a3fa120a2b7e6ac95e91d5c408f087455f7dc31f8b" +checksum = "2d072b2ba723f0bada7c515d8b3725224bc4f5052d2a92dcbeb0b118ff37084a" dependencies = [ "proc-macro2", "quote", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9538918d3e1fd6edda042d717c969a4099af67a40372dfb0a00b45d3a5a946" +checksum = "f60cdb0e18c5455cb6a85e8464aad3622b70476018edfa8845691df66f7e9a05" dependencies = [ "chalk-derive", "lazy_static", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8d95c808f2b540c39da889536e1ae0d15182107f61fe80000ec3a5c3959a" +checksum = "b14f40242102e7c0e2791a2cc86dbbc213a1d7b7acc0e22b7da329f4957d1722" dependencies = [ "chalk-derive", "chalk-ir", @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f373dff4bcff66004424b72bcc56ae62889c21887c1cac875f083f69a7da4448" +checksum = "981534d499a8476ecc0b520be4d3864757f96211826a75360fbf2cb6fae362ab" dependencies = [ "chalk-derive", "chalk-ir", diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index ed1c911c2d..0f3c85926a 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml @@ -17,9 +17,9 @@ ena = "0.14.0" log = "0.4.8" rustc-hash = "1.1.0" scoped-tls = "1" -chalk-solve = { version = "0.30.0" } -chalk-ir = { version = "0.30.0" } -chalk-recursive = { version = "0.30.0" } +chalk-solve = "0.32" +chalk-ir = "0.32" +chalk-recursive = "0.32" stdx = { path = "../stdx", version = "0.0.0" } hir_def = { path = "../hir_def", version = "0.0.0" } diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index 009b17a7f5..cbe5cd7dd6 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs @@ -330,6 +330,20 @@ impl<'a> chalk_solve::RustIrDatabase for ChalkContext<'a> { fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId) -> String { format!("fn_{}", fn_def_id.0) } + fn generator_datum( + &self, + _: chalk_ir::GeneratorId, + ) -> std::sync::Arc> { + // FIXME + unimplemented!() + } + fn generator_witness_datum( + &self, + _: chalk_ir::GeneratorId, + ) -> std::sync::Arc> { + // FIXME + unimplemented!() + } } pub(crate) fn program_clauses_for_chalk_env_query( diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs index d42f4bba9e..be33013132 100644 --- a/crates/hir_ty/src/traits/chalk/mapping.rs +++ b/crates/hir_ty/src/traits/chalk/mapping.rs @@ -399,6 +399,8 @@ impl ToChalk for TypeCtor { // this should not be reached, since we don't represent TypeName::Error with TypeCtor unreachable!() } + TypeName::Generator(_) => unimplemented!(), // FIXME + TypeName::GeneratorWitness(_) => unimplemented!(), // FIXME } } } diff --git a/editors/code/package.json b/editors/code/package.json index 1f0e7550b5..6a712a8a82 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1048,4 +1048,4 @@ ] } } -} \ No newline at end of file +}