Merge #7998

7998: Use more Chalk IDs r=flodiebold a=flodiebold Co-authored-by: Florian Diebold <flodiebold@gmail.com>
author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2021-03-13 16:58:04 +0000
committer: GitHub <noreply@github.com> 2021-03-13 16:58:04 +0000
commit: 6ab405f2e9861c34ab9e1ad86af6604523745cef (patch)
tree: a9c674c83723e2ed145793f72450c873da62a6fc /crates/hir_ty/src/traits/chalk
parent: d4533785698d439417bc5474fecd62a7f1707368 (diff)
parent: 9719ce9fc731a400c9744ba1a6569e978c1a97e7 (diff)
3 files changed, 22 insertions, 65 deletions
diff --git a/crates/hir_ty/src/traits/chalk/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs
index 54bd1c724..1dc3f497d 100644
--- a/crates/hir_ty/src/traits/chalk/interner.rs
+++ b/crates/hir_ty/src/traits/chalk/interner.rs
@@ -12,7 +12,6 @@ pub struct Interner;
 pub(crate) type AssocTypeId = chalk_ir::AssocTypeId<Interner>;
 pub(crate) type AssociatedTyDatum = chalk_solve::rust_ir::AssociatedTyDatum<Interner>;
-pub(crate) type ForeignDefId = chalk_ir::ForeignDefId<Interner>;
 pub(crate) type TraitId = chalk_ir::TraitId<Interner>;
 pub(crate) type TraitDatum = chalk_solve::rust_ir::TraitDatum<Interner>;
 pub(crate) type AdtId = chalk_ir::AdtId<Interner>;
@@ -21,7 +20,6 @@ pub(crate) type ImplId = chalk_ir::ImplId<Interner>;
 pub(crate) type ImplDatum = chalk_solve::rust_ir::ImplDatum<Interner>;
 pub(crate) type AssociatedTyValueId = chalk_solve::rust_ir::AssociatedTyValueId<Interner>;
 pub(crate) type AssociatedTyValue = chalk_solve::rust_ir::AssociatedTyValue<Interner>;
-pub(crate) type FnDefId = chalk_ir::FnDefId<Interner>;
 pub(crate) type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>;
 pub(crate) type OpaqueTyId = chalk_ir::OpaqueTyId<Interner>;
 pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>;
diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs
index 44cfb9359..23ef07d77 100644
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -14,6 +14,7 @@ use hir_def::{AssocContainerId, GenericDefId, Lookup, TypeAliasId};
 use crate::{
    db::HirDatabase,
+    from_assoc_type_id,
    primitive::UintTy,
    traits::{Canonical, Obligation},
    AliasTy, CallableDefId, FnPointer, FnSig, GenericPredicate, InEnvironment, OpaqueTy,
@@ -38,9 +39,7 @@ impl ToChalk for Ty {
                })
                .intern(&Interner)
            }
-            TyKind::AssociatedType(type_alias, substs) => {
+            TyKind::AssociatedType(assoc_type_id, substs) => {
-                let assoc_type = TypeAliasAsAssocType(type_alias);
-                let assoc_type_id = assoc_type.to_chalk(db);
                let substitution = substs.to_chalk(db);
                chalk_ir::TyKind::AssociatedType(assoc_type_id, substitution).intern(&Interner)
            }
@@ -51,11 +50,7 @@ impl ToChalk for Ty {
                chalk_ir::TyKind::OpaqueType(id, substitution).intern(&Interner)
            }
-            TyKind::ForeignType(type_alias) => {
+            TyKind::ForeignType(id) => chalk_ir::TyKind::Foreign(id).intern(&Interner),
-                let foreign_type = TypeAliasAsForeignType(type_alias);
-                let foreign_type_id = foreign_type.to_chalk(db);
-                chalk_ir::TyKind::Foreign(foreign_type_id).intern(&Interner)
-            }
            TyKind::Scalar(scalar) => chalk_ir::TyKind::Scalar(scalar).intern(&Interner),
@@ -71,8 +66,7 @@ impl ToChalk for Ty {
                chalk_ir::TyKind::Slice(substs[0].clone().to_chalk(db)).intern(&Interner)
            }
            TyKind::Str => chalk_ir::TyKind::Str.intern(&Interner),
-            TyKind::FnDef(callable_def, substs) => {
+            TyKind::FnDef(id, substs) => {
-                let id = callable_def.to_chalk(db);
                let substitution = substs.to_chalk(db);
                chalk_ir::TyKind::FnDef(id, substitution).intern(&Interner)
            }
@@ -89,7 +83,7 @@ impl ToChalk for Ty {
                chalk_ir::TyKind::Adt(adt_id, substitution).intern(&Interner)
            }
            TyKind::Alias(AliasTy::Projection(proj_ty)) => {
-                let associated_ty_id = TypeAliasAsAssocType(proj_ty.associated_ty).to_chalk(db);
+                let associated_ty_id = proj_ty.associated_ty;
                let substitution = proj_ty.parameters.to_chalk(db);
                chalk_ir::AliasTy::Projection(chalk_ir::ProjectionTy {
                    associated_ty_id,
@@ -143,8 +137,7 @@ impl ToChalk for Ty {
                TyKind::Placeholder(db.lookup_intern_type_param_id(interned_id))
            }
            chalk_ir::TyKind::Alias(chalk_ir::AliasTy::Projection(proj)) => {
-                let associated_ty =
+                let associated_ty = proj.associated_ty_id;
-                    from_chalk::<TypeAliasAsAssocType, _>(db, proj.associated_ty_id).0;
                let parameters = from_chalk(db, proj.substitution);
                TyKind::Alias(AliasTy::Projection(ProjectionTy { associated_ty, parameters }))
            }
@@ -184,10 +177,9 @@ impl ToChalk for Ty {
            }
            chalk_ir::TyKind::Adt(adt_id, subst) => TyKind::Adt(adt_id, from_chalk(db, subst)),
-            chalk_ir::TyKind::AssociatedType(type_id, subst) => TyKind::AssociatedType(
+            chalk_ir::TyKind::AssociatedType(type_id, subst) => {
-                from_chalk::<TypeAliasAsAssocType, _>(db, type_id).0,
+                TyKind::AssociatedType(type_id, from_chalk(db, subst))
-                from_chalk(db, subst),
+            }
-            ),
            chalk_ir::TyKind::OpaqueType(opaque_type_id, subst) => {
                TyKind::OpaqueType(from_chalk(db, opaque_type_id), from_chalk(db, subst))
@@ -208,7 +200,7 @@ impl ToChalk for Ty {
            chalk_ir::TyKind::Never => TyKind::Never,
            chalk_ir::TyKind::FnDef(fn_def_id, subst) => {
-                TyKind::FnDef(from_chalk(db, fn_def_id), from_chalk(db, subst))
+                TyKind::FnDef(fn_def_id, from_chalk(db, subst))
            }
            chalk_ir::TyKind::Closure(id, subst) => {
@@ -217,9 +209,7 @@ impl ToChalk for Ty {
                TyKind::Closure(def, expr, from_chalk(db, subst))
            }
-            chalk_ir::TyKind::Foreign(foreign_def_id) => {
+            chalk_ir::TyKind::Foreign(foreign_def_id) => TyKind::ForeignType(foreign_def_id),
-                TyKind::ForeignType(from_chalk::<TypeAliasAsForeignType, _>(db, foreign_def_id).0)
-            }
            chalk_ir::TyKind::Generator(_, _) => unimplemented!(), // FIXME
            chalk_ir::TyKind::GeneratorWitness(_, _) => unimplemented!(), // FIXME
        }
@@ -338,34 +328,6 @@ impl ToChalk for CallableDefId {
    }
 }
-pub(crate) struct TypeAliasAsAssocType(pub(crate) TypeAliasId);
-impl ToChalk for TypeAliasAsAssocType {
-    type Chalk = AssocTypeId;
-    fn to_chalk(self, _db: &dyn HirDatabase) -> AssocTypeId {
-        chalk_ir::AssocTypeId(self.0.as_intern_id())
-    }
-    fn from_chalk(_db: &dyn HirDatabase, assoc_type_id: AssocTypeId) -> TypeAliasAsAssocType {
-        TypeAliasAsAssocType(InternKey::from_intern_id(assoc_type_id.0))
-    }
-}
-pub(crate) struct TypeAliasAsForeignType(pub(crate) TypeAliasId);
-impl ToChalk for TypeAliasAsForeignType {
-    type Chalk = ForeignDefId;
-    fn to_chalk(self, _db: &dyn HirDatabase) -> ForeignDefId {
-        chalk_ir::ForeignDefId(self.0.as_intern_id())
-    }
-    fn from_chalk(_db: &dyn HirDatabase, foreign_def_id: ForeignDefId) -> TypeAliasAsForeignType {
-        TypeAliasAsForeignType(InternKey::from_intern_id(foreign_def_id.0))
-    }
-}
 pub(crate) struct TypeAliasAsValue(pub(crate) TypeAliasId);
 impl ToChalk for TypeAliasAsValue {
@@ -447,7 +409,7 @@ impl ToChalk for ProjectionTy {
    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::ProjectionTy<Interner> {
        chalk_ir::ProjectionTy {
-            associated_ty_id: TypeAliasAsAssocType(self.associated_ty).to_chalk(db),
+            associated_ty_id: self.associated_ty,
            substitution: self.parameters.to_chalk(db),
        }
    }
@@ -457,11 +419,7 @@ impl ToChalk for ProjectionTy {
        projection_ty: chalk_ir::ProjectionTy<Interner>,
    ) -> ProjectionTy {
        ProjectionTy {
-            associated_ty: from_chalk::<TypeAliasAsAssocType, _>(
+            associated_ty: projection_ty.associated_ty_id,
-                db,
-                projection_ty.associated_ty_id,
-            )
-            .0,
            parameters: from_chalk(db, projection_ty.substitution),
        }
    }
@@ -615,7 +573,10 @@ pub(super) fn generic_predicate_to_inline_bound(
            if &proj.projection_ty.parameters[0] != self_ty {
                return None;
            }
-            let trait_ = match proj.projection_ty.associated_ty.lookup(db.upcast()).container {
+            let trait_ = match from_assoc_type_id(proj.projection_ty.associated_ty)
+                .lookup(db.upcast())
+                .container
+            {
                AssocContainerId::TraitId(t) => t,
                _ => panic!("associated type not in trait"),
            };
@@ -626,8 +587,7 @@ pub(super) fn generic_predicate_to_inline_bound(
            let alias_eq_bound = rust_ir::AliasEqBound {
                value: proj.ty.clone().to_chalk(db),
                trait_bound: rust_ir::TraitBound { trait_id: trait_.to_chalk(db), args_no_self },
-                associated_ty_id: TypeAliasAsAssocType(proj.projection_ty.associated_ty)
+                associated_ty_id: proj.projection_ty.associated_ty,
-                    .to_chalk(db),
                parameters: Vec::new(), // FIXME we don't support generic associated types yet
            };
            Some(rust_ir::InlineBound::AliasEqBound(alias_eq_bound))
diff --git a/crates/hir_ty/src/traits/chalk/tls.rs b/crates/hir_ty/src/traits/chalk/tls.rs
index 75b16172e..8892a63a9 100644
--- a/crates/hir_ty/src/traits/chalk/tls.rs
+++ b/crates/hir_ty/src/traits/chalk/tls.rs
@@ -4,8 +4,8 @@ use std::fmt;
 use chalk_ir::{AliasTy, GenericArg, Goal, Goals, Lifetime, ProgramClauseImplication};
 use itertools::Itertools;
-use super::{from_chalk, Interner, TypeAliasAsAssocType};
+use super::{from_chalk, Interner};
-use crate::{db::HirDatabase, CallableDefId};
+use crate::{db::HirDatabase, from_assoc_type_id, CallableDefId};
 use hir_def::{AdtId, AssocContainerId, Lookup, TypeAliasId};
 pub(crate) use unsafe_tls::{set_current_program, with_current_program};
@@ -41,7 +41,7 @@ impl DebugContext<'_> {
        id: super::AssocTypeId,
        fmt: &mut fmt::Formatter<'_>,
    ) -> Result<(), fmt::Error> {
-        let type_alias: TypeAliasId = from_chalk::<TypeAliasAsAssocType, _>(self.0, id).0;
+        let type_alias: TypeAliasId = from_assoc_type_id(id);
        let type_alias_data = self.0.type_alias_data(type_alias);
        let trait_ = match type_alias.lookup(self.0.upcast()).container {
            AssocContainerId::TraitId(t) => t,
@@ -75,8 +75,7 @@ impl DebugContext<'_> {
        projection_ty: &chalk_ir::ProjectionTy<Interner>,
        fmt: &mut fmt::Formatter<'_>,
    ) -> Result<(), fmt::Error> {
-        let type_alias: TypeAliasId =
+        let type_alias = from_assoc_type_id(projection_ty.associated_ty_id);
-            from_chalk::<TypeAliasAsAssocType, _>(self.0, projection_ty.associated_ty_id).0;
        let type_alias_data = self.0.type_alias_data(type_alias);
        let trait_ = match type_alias.lookup(self.0.upcast()).container {
            AssocContainerId::TraitId(t) => t,
author	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2021-03-13 16:58:04 +0000
committer	GitHub <noreply@github.com>	2021-03-13 16:58:04 +0000
commit	6ab405f2e9861c34ab9e1ad86af6604523745cef (patch)
tree	a9c674c83723e2ed145793f72450c873da62a6fc /crates/hir_ty/src/traits/chalk
parent	d4533785698d439417bc5474fecd62a7f1707368 (diff)
parent	9719ce9fc731a400c9744ba1a6569e978c1a97e7 (diff)