From 429bbbd39a7bcb8650b522a9d683d20d76269770 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 3 Apr 2021 17:41:14 +0200 Subject: Make ToChalk implementations identity --- crates/hir_ty/src/traits.rs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'crates/hir_ty/src/traits.rs') diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index 7d87741b8..cc1d2ca18 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs @@ -173,20 +173,7 @@ fn solution_from_chalk( db: &dyn HirDatabase, solution: chalk_solve::Solution, ) -> Solution { - match solution { - chalk_solve::Solution::Unique(constr_subst) => { - Solution::Unique(from_chalk(db, constr_subst)) - } - chalk_solve::Solution::Ambig(chalk_solve::Guidance::Definite(subst)) => { - Solution::Ambig(Guidance::Definite(from_chalk(db, subst))) - } - chalk_solve::Solution::Ambig(chalk_solve::Guidance::Suggested(subst)) => { - Solution::Ambig(Guidance::Suggested(from_chalk(db, subst))) - } - chalk_solve::Solution::Ambig(chalk_solve::Guidance::Unknown) => { - Solution::Ambig(Guidance::Unknown) - } - } + solution } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] -- cgit v1.2.3 From a838a60caaa5351d7543bcbebb1aa976b0b73f39 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Thu, 8 Apr 2021 13:51:04 +0200 Subject: Fix missing match arms --- crates/hir_ty/src/traits.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/hir_ty/src/traits.rs') diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index cc1d2ca18..de1d37e17 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs @@ -81,6 +81,7 @@ pub(crate) fn trait_solve_query( db.trait_data(it.hir_trait_id()).name.to_string() } DomainGoal::Holds(WhereClause::AliasEq(_)) => "alias_eq".to_string(), + _ => "??".to_string(), }); log::info!("trait_solve_query({})", goal.value.goal.display(db)); -- cgit v1.2.3 From 8ce6fea325c001deeed2857da560fa5cfbc6eea3 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Thu, 8 Apr 2021 14:16:05 +0200 Subject: Remove identity impls for ToChalk --- crates/hir_ty/src/traits.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/hir_ty/src/traits.rs') diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index de1d37e17..63d87fe61 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs @@ -96,7 +96,7 @@ pub(crate) fn trait_solve_query( } } - let canonical = goal.to_chalk(db).cast(&Interner); + let canonical = goal.cast(&Interner); // We currently don't deal with universes (I think / hope they're not yet // relevant for our use cases?) -- cgit v1.2.3 From d992736e796501b2a5ae232644924a3dfefede92 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Thu, 8 Apr 2021 14:35:15 +0200 Subject: Remove unused --- crates/hir_ty/src/traits.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'crates/hir_ty/src/traits.rs') 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::{ Solution, TraitRefExt, Ty, TyKind, WhereClause, }; -use self::chalk::{from_chalk, Interner, ToChalk}; +use self::chalk::Interner; pub(crate) mod chalk; @@ -101,8 +101,7 @@ pub(crate) fn trait_solve_query( // We currently don't deal with universes (I think / hope they're not yet // relevant for our use cases?) let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; - let solution = solve(db, krate, &u_canonical); - solution.map(|solution| solution_from_chalk(db, solution)) + solve(db, krate, &u_canonical) } fn solve( @@ -170,13 +169,6 @@ fn is_chalk_print() -> bool { std::env::var("CHALK_PRINT").is_ok() } -fn solution_from_chalk( - db: &dyn HirDatabase, - solution: chalk_solve::Solution, -) -> Solution { - solution -} - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum FnTrait { FnOnce, -- cgit v1.2.3