diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-27 18:48:00 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-27 18:48:00 +0100 |
commit | 21fa889cf3f70c507e3b9f2f6362e65cbb8ed955 (patch) | |
tree | 90f434b1aa7326f35c73c2ed2e0b73eeb78da8ef /crates/ra_hir/src | |
parent | 2b69c84396cf376b496e7de3c954400e51b5fc24 (diff) | |
parent | 35f1655b0bc0452ee5f2bed521ebb12c17a8a20d (diff) |
Merge #1930
1930: replace horrible hack with a slightly less horrible one r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r-- | crates/ra_hir/src/ty/traits.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs index d11dab294..90a11ac7d 100644 --- a/crates/ra_hir/src/ty/traits.rs +++ b/crates/ra_hir/src/ty/traits.rs | |||
@@ -30,6 +30,9 @@ impl PartialEq for TraitSolver { | |||
30 | 30 | ||
31 | impl Eq for TraitSolver {} | 31 | impl Eq for TraitSolver {} |
32 | 32 | ||
33 | // FIXME: this impl is WRONG, chalk is not RefUnwindSafe, and this causes #1927 | ||
34 | impl std::panic::RefUnwindSafe for TraitSolver {} | ||
35 | |||
33 | impl TraitSolver { | 36 | impl TraitSolver { |
34 | fn solve( | 37 | fn solve( |
35 | &self, | 38 | &self, |