Skip to content

Commit 56a8a76

Browse files
committed
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
1 parent bf1043c commit 56a8a76

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

Cargo.lock

Lines changed: 8 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir_ty/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ ena = "0.14.0"
1717
log = "0.4.8"
1818
rustc-hash = "1.1.0"
1919
scoped-tls = "1"
20-
chalk-solve = { version = "0.30.0" }
21-
chalk-ir = { version = "0.30.0" }
22-
chalk-recursive = { version = "0.30.0" }
20+
chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
21+
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
22+
chalk-recursive = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
2323

2424
stdx = { path = "../stdx", version = "0.0.0" }
2525
hir_def = { path = "../hir_def", version = "0.0.0" }

crates/hir_ty/src/traits/chalk.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,18 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
330330
fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String {
331331
format!("fn_{}", fn_def_id.0)
332332
}
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+
}
333345
}
334346

335347
pub(crate) fn program_clauses_for_chalk_env_query(

crates/hir_ty/src/traits/chalk/mapping.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ impl ToChalk for TypeCtor {
399399
// this should not be reached, since we don't represent TypeName::Error with TypeCtor
400400
unreachable!()
401401
}
402+
_ => todo!(),
402403
}
403404
}
404405
}

editors/code/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,4 +1048,4 @@
10481048
]
10491049
}
10501050
}
1051-
}
1051+
}

0 commit comments

Comments
 (0)