1 files changed, 4 insertions, 187 deletions

diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs
index 62cf0fecf..54783b58c 100644
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -18,55 +18,6 @@ use crate::{
 use super::interner::*;
 use super::*;
 
-impl ToChalk for Ty {
-    type Chalk = chalk_ir::Ty<Interner>;
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Ty<Interner> {
-        self
-    }
-    fn from_chalk(db: &dyn HirDatabase, chalk: chalk_ir::Ty<Interner>) -> Self {
-        chalk
-    }
-}
-
-impl ToChalk for GenericArg {
-    type Chalk = chalk_ir::GenericArg<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> Self::Chalk {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, chalk: Self::Chalk) -> Self {
-        chalk
-    }
-}
-
-impl ToChalk for Substitution {
-    type Chalk = chalk_ir::Substitution<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Substitution<Interner> {
-        self
-    }
-
-    fn from_chalk(
-        db: &dyn HirDatabase,
-        parameters: chalk_ir::Substitution<Interner>,
-    ) -> Substitution {
-        parameters
-    }
-}
-
-impl ToChalk for TraitRef {
-    type Chalk = chalk_ir::TraitRef<Interner>;
-
-    fn to_chalk(self: TraitRef, db: &dyn HirDatabase) -> chalk_ir::TraitRef<Interner> {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, trait_ref: chalk_ir::TraitRef<Interner>) -> Self {
-        trait_ref
-    }
-}
-
 impl ToChalk for hir_def::TraitId {
     type Chalk = TraitId;
 
@@ -120,140 +71,6 @@ impl ToChalk for TypeAliasAsValue {
     }
 }
 
-impl ToChalk for WhereClause {
-    type Chalk = chalk_ir::WhereClause<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::WhereClause<Interner> {
-        self
-    }
-
-    fn from_chalk(
-        db: &dyn HirDatabase,
-        where_clause: chalk_ir::WhereClause<Interner>,
-    ) -> WhereClause {
-        where_clause
-    }
-}
-
-impl ToChalk for ProjectionTy {
-    type Chalk = chalk_ir::ProjectionTy<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::ProjectionTy<Interner> {
-        self
-    }
-
-    fn from_chalk(
-        db: &dyn HirDatabase,
-        projection_ty: chalk_ir::ProjectionTy<Interner>,
-    ) -> ProjectionTy {
-        projection_ty
-    }
-}
-impl ToChalk for OpaqueTy {
-    type Chalk = chalk_ir::OpaqueTy<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> Self::Chalk {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, chalk: Self::Chalk) -> Self {
-        chalk
-    }
-}
-
-impl ToChalk for AliasTy {
-    type Chalk = chalk_ir::AliasTy<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> Self::Chalk {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, chalk: Self::Chalk) -> Self {
-        chalk
-    }
-}
-
-impl ToChalk for AliasEq {
-    type Chalk = chalk_ir::AliasEq<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::AliasEq<Interner> {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, alias_eq: chalk_ir::AliasEq<Interner>) -> Self {
-        alias_eq
-    }
-}
-
-impl ToChalk for DomainGoal {
-    type Chalk = chalk_ir::DomainGoal<Interner>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::DomainGoal<Interner> {
-        self
-    }
-
-    fn from_chalk(_db: &dyn HirDatabase, goal: chalk_ir::DomainGoal<Interner>) -> Self {
-        goal
-    }
-}
-
-impl<T> ToChalk for Canonical<T>
-where
-    T: HasInterner<Interner = Interner>,
-{
-    type Chalk = chalk_ir::Canonical<T>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Canonical<T> {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, canonical: chalk_ir::Canonical<T>) -> Canonical<T> {
-        canonical
-    }
-}
-
-impl<T: ToChalk> ToChalk for InEnvironment<T>
-where
-    T: HasInterner<Interner = Interner>,
-{
-    type Chalk = chalk_ir::InEnvironment<T>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::InEnvironment<T> {
-        self
-    }
-
-    fn from_chalk(_db: &dyn HirDatabase, in_env: chalk_ir::InEnvironment<T>) -> InEnvironment<T> {
-        in_env
-    }
-}
-
-impl<T: ToChalk> ToChalk for crate::Binders<T>
-where
-    T: HasInterner<Interner = Interner>,
-{
-    type Chalk = chalk_ir::Binders<T>;
-
-    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Binders<T> {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, binders: chalk_ir::Binders<T>) -> crate::Binders<T> {
-        binders
-    }
-}
-
-impl ToChalk for crate::ConstrainedSubst {
-    type Chalk = chalk_ir::ConstrainedSubst<Interner>;
-
-    fn to_chalk(self, _db: &dyn HirDatabase) -> Self::Chalk {
-        self
-    }
-
-    fn from_chalk(db: &dyn HirDatabase, chalk: Self::Chalk) -> Self {
-        chalk
-    }
-}
-
 pub(super) fn make_binders<T>(value: T, num_vars: usize) -> chalk_ir::Binders<T>
 where
     T: HasInterner<Interner = Interner>,
@@ -276,7 +93,7 @@ pub(super) fn convert_where_clauses(
     let generic_predicates = db.generic_predicates(def);
     let mut result = Vec::with_capacity(generic_predicates.len());
     for pred in generic_predicates.iter() {
-        result.push(pred.clone().substitute(&Interner, substs).to_chalk(db));
+        result.push(pred.clone().substitute(&Interner, substs));
     }
     result
 }
@@ -299,7 +116,7 @@ pub(super) fn generic_predicate_to_inline_bound(
             }
             let args_no_self = trait_ref.substitution.interned()[1..]
                 .iter()
-                .map(|ty| ty.clone().to_chalk(db).cast(&Interner))
+                .map(|ty| ty.clone().cast(&Interner))
                 .collect();
             let trait_bound = rust_ir::TraitBound { trait_id: trait_ref.trait_id, args_no_self };
             Some(chalk_ir::Binders::new(binders, rust_ir::InlineBound::TraitBound(trait_bound)))
@@ -311,10 +128,10 @@ pub(super) fn generic_predicate_to_inline_bound(
             let trait_ = projection_ty.trait_(db);
             let args_no_self = projection_ty.substitution.interned()[1..]
                 .iter()
-                .map(|ty| ty.clone().to_chalk(db).cast(&Interner))
+                .map(|ty| ty.clone().cast(&Interner))
                 .collect();
             let alias_eq_bound = rust_ir::AliasEqBound {
-                value: ty.clone().to_chalk(db),
+                value: ty.clone(),
                 trait_bound: rust_ir::TraitBound { trait_id: trait_.to_chalk(db), args_no_self },
                 associated_ty_id: projection_ty.associated_ty_id,
                 parameters: Vec::new(), // FIXME we don't support generic associated types yet