diff options
author | Florian Diebold <[email protected]> | 2020-02-02 16:11:54 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2020-02-07 17:28:10 +0000 |
commit | a3d8cffde39bfb0d50b87a8ded5e0534adec4cd5 (patch) | |
tree | 3be5406b38c2594808c87d9dbecf7aa14b52b67d /crates/ra_hir_ty/src/traits | |
parent | 86348f5994cdc3831edf3a5582d6d9d576fd1d80 (diff) |
Use variables in predicates as well
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs index 6e97f7dd2..8260bd157 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/ra_hir_ty/src/traits/chalk.rs | |||
@@ -14,7 +14,7 @@ use ra_db::{ | |||
14 | use super::{builtin, AssocTyValue, Canonical, ChalkContext, Impl, Obligation}; | 14 | use super::{builtin, AssocTyValue, Canonical, ChalkContext, Impl, Obligation}; |
15 | use crate::{ | 15 | use crate::{ |
16 | db::HirDatabase, display::HirDisplay, utils::generics, ApplicationTy, GenericPredicate, | 16 | db::HirDatabase, display::HirDisplay, utils::generics, ApplicationTy, GenericPredicate, |
17 | ProjectionTy, Substs, TraitRef, Ty, TypeCtor, TypeWalk, | 17 | ProjectionTy, Substs, TraitRef, Ty, TypeCtor, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | #[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord, PartialEq, Eq)] | 20 | #[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord, PartialEq, Eq)] |
@@ -522,11 +522,11 @@ fn convert_where_clauses( | |||
522 | let generic_predicates = db.generic_predicates(def); | 522 | let generic_predicates = db.generic_predicates(def); |
523 | let mut result = Vec::with_capacity(generic_predicates.len()); | 523 | let mut result = Vec::with_capacity(generic_predicates.len()); |
524 | for pred in generic_predicates.iter() { | 524 | for pred in generic_predicates.iter() { |
525 | if pred.is_error() { | 525 | if pred.value.is_error() { |
526 | // skip errored predicates completely | 526 | // skip errored predicates completely |
527 | continue; | 527 | continue; |
528 | } | 528 | } |
529 | result.push(pred.clone().subst_type_params(db, def, substs).to_chalk(db)); | 529 | result.push(pred.clone().subst(substs).to_chalk(db)); |
530 | } | 530 | } |
531 | result | 531 | result |
532 | } | 532 | } |