diff options
author | Florian Diebold <[email protected]> | 2020-03-27 13:50:08 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2020-04-05 18:23:18 +0100 |
commit | 3659502816134b45448799acf428055e40fdf4fc (patch) | |
tree | 4a6e1c8e489f5aa61361cc336f719b4d19739eac /crates/ra_hir_ty/src/traits.rs | |
parent | 3431312418ea255e98d3f94536344d396b9b07d6 (diff) |
Upgrade Chalk
Diffstat (limited to 'crates/ra_hir_ty/src/traits.rs')
-rw-r--r-- | crates/ra_hir_ty/src/traits.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/traits.rs b/crates/ra_hir_ty/src/traits.rs index a1ca33c98..80eae4eca 100644 --- a/crates/ra_hir_ty/src/traits.rs +++ b/crates/ra_hir_ty/src/traits.rs | |||
@@ -153,7 +153,7 @@ pub(crate) fn trait_solve_query( | |||
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | let canonical = goal.to_chalk(db).cast(); | 156 | let canonical = goal.to_chalk(db).cast(&Interner); |
157 | 157 | ||
158 | // We currently don't deal with universes (I think / hope they're not yet | 158 | // We currently don't deal with universes (I think / hope they're not yet |
159 | // relevant for our use cases?) | 159 | // relevant for our use cases?) |
@@ -194,8 +194,8 @@ fn solution_from_chalk( | |||
194 | let convert_subst = |subst: chalk_ir::Canonical<chalk_ir::Substitution<Interner>>| { | 194 | let convert_subst = |subst: chalk_ir::Canonical<chalk_ir::Substitution<Interner>>| { |
195 | let value = subst | 195 | let value = subst |
196 | .value | 196 | .value |
197 | .into_iter() | 197 | .iter(&Interner) |
198 | .map(|p| match p.ty() { | 198 | .map(|p| match p.ty(&Interner) { |
199 | Some(ty) => from_chalk(db, ty.clone()), | 199 | Some(ty) => from_chalk(db, ty.clone()), |
200 | None => unimplemented!(), | 200 | None => unimplemented!(), |
201 | }) | 201 | }) |