diff options
author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /crates/ra_hir_ty/src/traits | |
parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs index 53ce362ea..1bc0f0713 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/ra_hir_ty/src/traits/chalk.rs | |||
@@ -427,7 +427,12 @@ impl ToChalk for GenericPredicate { | |||
427 | db: &dyn HirDatabase, | 427 | db: &dyn HirDatabase, |
428 | where_clause: chalk_ir::QuantifiedWhereClause<Interner>, | 428 | where_clause: chalk_ir::QuantifiedWhereClause<Interner>, |
429 | ) -> GenericPredicate { | 429 | ) -> GenericPredicate { |
430 | match where_clause.value { | 430 | // we don't produce any where clauses with binders and can't currently deal with them |
431 | match where_clause | ||
432 | .value | ||
433 | .shifted_out(&Interner) | ||
434 | .expect("unexpected bound vars in where clause") | ||
435 | { | ||
431 | chalk_ir::WhereClause::Implemented(tr) => { | 436 | chalk_ir::WhereClause::Implemented(tr) => { |
432 | GenericPredicate::Implemented(from_chalk(db, tr)) | 437 | GenericPredicate::Implemented(from_chalk(db, tr)) |
433 | } | 438 | } |