diff options
Diffstat (limited to 'crates/hir_ty/src/traits.rs')
-rw-r--r-- | crates/hir_ty/src/traits.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index 63d87fe61..1cda72d22 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs | |||
@@ -12,7 +12,7 @@ use crate::{ | |||
12 | Solution, TraitRefExt, Ty, TyKind, WhereClause, | 12 | Solution, TraitRefExt, Ty, TyKind, WhereClause, |
13 | }; | 13 | }; |
14 | 14 | ||
15 | use self::chalk::{from_chalk, Interner, ToChalk}; | 15 | use self::chalk::Interner; |
16 | 16 | ||
17 | pub(crate) mod chalk; | 17 | pub(crate) mod chalk; |
18 | 18 | ||
@@ -101,8 +101,7 @@ pub(crate) fn trait_solve_query( | |||
101 | // We currently don't deal with universes (I think / hope they're not yet | 101 | // We currently don't deal with universes (I think / hope they're not yet |
102 | // relevant for our use cases?) | 102 | // relevant for our use cases?) |
103 | let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; | 103 | let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; |
104 | let solution = solve(db, krate, &u_canonical); | 104 | solve(db, krate, &u_canonical) |
105 | solution.map(|solution| solution_from_chalk(db, solution)) | ||
106 | } | 105 | } |
107 | 106 | ||
108 | fn solve( | 107 | fn solve( |
@@ -170,13 +169,6 @@ fn is_chalk_print() -> bool { | |||
170 | std::env::var("CHALK_PRINT").is_ok() | 169 | std::env::var("CHALK_PRINT").is_ok() |
171 | } | 170 | } |
172 | 171 | ||
173 | fn solution_from_chalk( | ||
174 | db: &dyn HirDatabase, | ||
175 | solution: chalk_solve::Solution<Interner>, | ||
176 | ) -> Solution { | ||
177 | solution | ||
178 | } | ||
179 | |||
180 | #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] | 172 | #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] |
181 | pub enum FnTrait { | 173 | pub enum FnTrait { |
182 | FnOnce, | 174 | FnOnce, |