Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-20 14:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump chalk to use latest git to get fix

Browse source 
* 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
This commit is contained in:
Casey Primozic 2020-10-06 15:05:20 -07:00
parent bf1043cac2
commit 56a8a7645f
No known key found for this signature in database
GPG key ID: 2A02222DA3425B99
5 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -162,9 +162,8 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "chalk-derive"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6696d18587b7470c1e357a3fa120a2b7e6ac95e91d5c408f087455f7dc31f8b"
version = "0.32.0-dev.0"
source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
dependencies = [
"proc-macro2",
"quote",
@ -174,9 +173,8 @@ dependencies = [
[[package]]
name = "chalk-ir"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c9538918d3e1fd6edda042d717c969a4099af67a40372dfb0a00b45d3a5a946"
version = "0.32.0-dev.0"
source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
dependencies = [
"chalk-derive",
"lazy_static",
@ -184,9 +182,8 @@ dependencies = [
[[package]]
name = "chalk-recursive"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97ec8d95c808f2b540c39da889536e1ae0d15182107f61fe80000ec3a5c3959a"
version = "0.32.0-dev.0"
source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
dependencies = [
"chalk-derive",
"chalk-ir",
@ -197,9 +194,8 @@ dependencies = [
[[package]]
name = "chalk-solve"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f373dff4bcff66004424b72bcc56ae62889c21887c1cac875f083f69a7da4448"
version = "0.32.0-dev.0"
source = "git+https://github.com/rust-lang/chalk.git?rev=ebe62c2bc46899a0a92eabb456b38ad2d40abbd0#ebe62c2bc46899a0a92eabb456b38ad2d40abbd0"
dependencies = [
"chalk-derive",
"chalk-ir",

6
crates/hir_ty/Cargo.toml
View file

@ -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 = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
chalk-recursive = { git = "https://github.com/rust-lang/chalk.git", rev="ebe62c2bc46899a0a92eabb456b38ad2d40abbd0" }
stdx = { path = "../stdx", version = "0.0.0" }
hir_def = { path = "../hir_def", version = "0.0.0" }

12
crates/hir_ty/src/traits/chalk.rs
View file

@ -330,6 +330,18 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String {
format!("fn_{}", fn_def_id.0)
}
fn generator_datum(
&self,
_: chalk_ir::GeneratorId<Interner>,
) -> std::sync::Arc<chalk_solve::rust_ir::GeneratorDatum<Interner>> {
todo!()
}
fn generator_witness_datum(
&self,
_: chalk_ir::GeneratorId<Interner>,
) -> std::sync::Arc<chalk_solve::rust_ir::GeneratorWitnessDatum<Interner>> {
todo!()
}
}
pub(crate) fn program_clauses_for_chalk_env_query(

1
crates/hir_ty/src/traits/chalk/mapping.rs
View file

@ -399,6 +399,7 @@ impl ToChalk for TypeCtor {
// this should not be reached, since we don't represent TypeName::Error with TypeCtor
unreachable!()
}
_ => todo!(),
}
}
}