diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-07 21:46:33 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-07 21:46:33 +0100 |
commit | e95e666b106b2f63ab2b350e656c9e8b96441fa7 (patch) | |
tree | cae4a578e5aef08fc2eb2c0875c316bac15312b5 /crates/hir_ty/src/traits/chalk | |
parent | 83a651b123c08d786d1328293fc0327252a6d5d3 (diff) | |
parent | 37df2138ecb4a66aa8547467c7774dc9d378567b (diff) |
Merge #6161
6161: Bump chalk to use latest git to get upstream fix r=jonas-schievink a=Ameobea
* 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
Co-authored-by: Casey Primozic <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/traits/chalk')
-rw-r--r-- | crates/hir_ty/src/traits/chalk/mapping.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs index d42f4bba9..be3301313 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 { | |||
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 | TypeName::Generator(_) => unimplemented!(), // FIXME | ||
403 | TypeName::GeneratorWitness(_) => unimplemented!(), // FIXME | ||
402 | } | 404 | } |
403 | } | 405 | } |
404 | } | 406 | } |