diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-23 19:36:45 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-23 19:36:45 +0100 |
commit | a745afcc36ef273eb44bc9f71a40d9948d7309b0 (patch) | |
tree | adff6999ea04ad0a6d40b1f0d2f9706784c1cd3b /crates/ra_hir/src/ty/traits | |
parent | 5063274959e5f6d5cf3b5c840c17a630ad013a97 (diff) | |
parent | 6df9c4035ac6e7d5fc0126f975c4a8a7838d008f (diff) |
Merge #1899
1899: Upgrade Chalk r=flodiebold a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/traits')
-rw-r--r-- | crates/ra_hir/src/ty/traits/chalk.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs index cfecf75ee..2e17c00e4 100644 --- a/crates/ra_hir/src/ty/traits/chalk.rs +++ b/crates/ra_hir/src/ty/traits/chalk.rs | |||
@@ -423,10 +423,12 @@ where | |||
423 | fn custom_clauses(&self) -> Vec<chalk_ir::ProgramClause> { | 423 | fn custom_clauses(&self) -> Vec<chalk_ir::ProgramClause> { |
424 | vec![] | 424 | vec![] |
425 | } | 425 | } |
426 | fn all_structs(&self) -> Vec<chalk_ir::StructId> { | 426 | fn local_impls_to_coherence_check( |
427 | debug!("all_structs"); | 427 | &self, |
428 | // FIXME | 428 | _trait_id: chalk_ir::TraitId, |
429 | vec![] | 429 | ) -> Vec<chalk_ir::ImplId> { |
430 | // We don't do coherence checking (yet) | ||
431 | unimplemented!() | ||
430 | } | 432 | } |
431 | } | 433 | } |
432 | 434 | ||