aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasey Primozic <[email protected]>2020-10-06 23:05:20 +0100
committerCasey Primozic <[email protected]>2020-10-06 23:05:20 +0100
commit56a8a7645f9d6c872e9598b5a2617805f387e2a6 (patch)
treebe94bbbf4293f37d35d66092cbf9a6d9ebef2bd4
parentbf1043cac2f3cc2264d9fcda242f63616f4efa1b (diff)
Bump chalk to use latest git to get fix
* Chalk very recently (like an hour ago) merged a fix that prevents rust analyzer from panicking. This allows it to be usable again for code that hits those situations. See #6134, #6145, Probably #6120
-rw-r--r--Cargo.lock20
-rw-r--r--crates/hir_ty/Cargo.toml6
-rw-r--r--crates/hir_ty/src/traits/chalk.rs12
-rw-r--r--crates/hir_ty/src/traits/chalk/mapping.rs1
-rw-r--r--editors/code/package.json2
5 files changed, 25 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 49022502d..9c921902c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -162,9 +162,8 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
162 162
163[[package]] 163[[package]]
164name = "chalk-derive" 164name = "chalk-derive"
165version = "0.30.0" 165version = "0.32.0-dev.0"
166source = "registry+https://github.com/rust-lang/crates.io-index" 166source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
167checksum = "a6696d18587b7470c1e357a3fa120a2b7e6ac95e91d5c408f087455f7dc31f8b"
168dependencies = [ 167dependencies = [
169 "proc-macro2", 168 "proc-macro2",
170 "quote", 169 "quote",
@@ -174,9 +173,8 @@ dependencies = [
174 173
175[[package]] 174[[package]]
176name = "chalk-ir" 175name = "chalk-ir"
177version = "0.30.0" 176version = "0.32.0-dev.0"
178source = "registry+https://github.com/rust-lang/crates.io-index" 177source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
179checksum = "8c9538918d3e1fd6edda042d717c969a4099af67a40372dfb0a00b45d3a5a946"
180dependencies = [ 178dependencies = [
181 "chalk-derive", 179 "chalk-derive",
182 "lazy_static", 180 "lazy_static",
@@ -184,9 +182,8 @@ dependencies = [
184 182
185[[package]] 183[[package]]
186name = "chalk-recursive" 184name = "chalk-recursive"
187version = "0.30.0" 185version = "0.32.0-dev.0"
188source = "registry+https://github.com/rust-lang/crates.io-index" 186source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
189checksum = "97ec8d95c808f2b540c39da889536e1ae0d15182107f61fe80000ec3a5c3959a"
190dependencies = [ 187dependencies = [
191 "chalk-derive", 188 "chalk-derive",
192 "chalk-ir", 189 "chalk-ir",
@@ -197,9 +194,8 @@ dependencies = [
197 194
198[[package]] 195[[package]]
199name = "chalk-solve" 196name = "chalk-solve"
200version = "0.30.0" 197version = "0.32.0-dev.0"
201source = "registry+https://github.com/rust-lang/crates.io-index" 198source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
202checksum = "f373dff4bcff66004424b72bcc56ae62889c21887c1cac875f083f69a7da4448"
203dependencies = [ 199dependencies = [
204 "chalk-derive", 200 "chalk-derive",
205 "chalk-ir", 201 "chalk-ir",
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index ed1c911c2..15c536c89 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -17,9 +17,9 @@ ena = "0.14.0"
17log = "0.4.8" 17log = "0.4.8"
18rustc-hash = "1.1.0" 18rustc-hash = "1.1.0"
19scoped-tls = "1" 19scoped-tls = "1"
20chalk-solve = { version = "0.30.0" } 20chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
21chalk-ir = { version = "0.30.0" } 21chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
22chalk-recursive = { version = "0.30.0" } 22chalk-recursive = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
23 23
24stdx = { path = "../stdx", version = "0.0.0" } 24stdx = { path = "../stdx", version = "0.0.0" }
25hir_def = { path = "../hir_def", version = "0.0.0" } 25hir_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 009b17a7f..980218162 100644
--- a/crates/hir_ty/src/traits/chalk.rs
+++ b/crates/hir_ty/src/traits/chalk.rs
@@ -330,6 +330,18 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
330 fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String { 330 fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String {
331 format!("fn_{}", fn_def_id.0) 331 format!("fn_{}", fn_def_id.0)
332 } 332 }
333 fn generator_datum(
334 &self,
335 _: chalk_ir::GeneratorId<Interner>,
336 ) -> std::sync::Arc<chalk_solve::rust_ir::GeneratorDatum<Interner>> {
337 todo!()
338 }
339 fn generator_witness_datum(
340 &self,
341 _: chalk_ir::GeneratorId<Interner>,
342 ) -> std::sync::Arc<chalk_solve::rust_ir::GeneratorWitnessDatum<Interner>> {
343 todo!()
344 }
333} 345}
334 346
335pub(crate) fn program_clauses_for_chalk_env_query( 347pub(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 d42f4bba9..140b20213 100644
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -399,6 +399,7 @@ impl ToChalk for TypeCtor {
399 // this should not be reached, since we don't represent TypeName::Error with TypeCtor 399 // this should not be reached, since we don't represent TypeName::Error with TypeCtor
400 unreachable!() 400 unreachable!()
401 } 401 }
402 _ => todo!(),
402 } 403 }
403 } 404 }
404} 405}
diff --git a/editors/code/package.json b/editors/code/package.json
index 1f0e7550b..6a712a8a8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -1048,4 +1048,4 @@
1048 ] 1048 ]
1049 } 1049 }
1050 } 1050 }
1051} \ No newline at end of file 1051}