1 files changed, 23 insertions, 19 deletions

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index b41a36a78..5ebd0a3b8 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -56,9 +56,9 @@ use hir_ty::{
     primitive::UintTy,
     to_assoc_type_id,
     traits::{FnTrait, Solution, SolutionVariables},
-    AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, GenericPredicate,
-    InEnvironment, Interner, Obligation, ProjectionPredicate, ProjectionTy, Scalar, Substitution,
-    Ty, TyDefId, TyKind, TyVariableKind,
+    AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex,
+    GenericPredicate, InEnvironment, Interner, Obligation, ProjectionTy, Scalar, Substitution, Ty,
+    TyDefId, TyKind, TyVariableKind,
 };
 use itertools::Itertools;
 use rustc_hash::FxHashSet;
@@ -1144,17 +1144,21 @@ impl MacroDef {
 
     /// XXX: this parses the file
     pub fn name(self, db: &dyn HirDatabase) -> Option<Name> {
-        self.source(db)?.value.name().map(|it| it.as_name())
+        match self.source(db)?.value {
+            Either::Left(it) => it.name().map(|it| it.as_name()),
+            Either::Right(it) => it.name().map(|it| it.as_name()),
+        }
     }
 
     /// Indicate it is a proc-macro
     pub fn is_proc_macro(&self) -> bool {
-        matches!(self.id.kind, MacroDefKind::ProcMacro(_))
+        matches!(self.id.kind, MacroDefKind::ProcMacro(..))
     }
 
     /// Indicate it is a derive macro
     pub fn is_derive_macro(&self) -> bool {
-        matches!(self.id.kind, MacroDefKind::ProcMacro(_) | MacroDefKind::BuiltInDerive(_))
+        // FIXME: wrong for `ProcMacro`
+        matches!(self.id.kind, MacroDefKind::ProcMacro(..) | MacroDefKind::BuiltInDerive(..))
     }
 }
 
@@ -1458,7 +1462,7 @@ impl TypeParam {
             .into_iter()
             .filter_map(|pred| match &pred.value {
                 hir_ty::GenericPredicate::Implemented(trait_ref) => {
-                    Some(Trait::from(trait_ref.trait_))
+                    Some(Trait::from(trait_ref.hir_trait_id()))
                 }
                 _ => None,
             })
@@ -1753,8 +1757,8 @@ impl Type {
 
     pub fn impls_trait(&self, db: &dyn HirDatabase, trait_: Trait, args: &[Type]) -> bool {
         let trait_ref = hir_ty::TraitRef {
-            trait_: trait_.id,
-            substs: Substitution::build_for_def(db, trait_.id)
+            trait_id: hir_ty::to_chalk_trait_id(trait_.id),
+            substitution: Substitution::build_for_def(db, trait_.id)
                 .push(self.ty.value.clone())
                 .fill(args.iter().map(|t| t.ty.value.clone()))
                 .build(),
@@ -1782,17 +1786,17 @@ impl Type {
             .push(self.ty.value.clone())
             .fill(args.iter().map(|t| t.ty.value.clone()))
             .build();
-        let predicate = ProjectionPredicate {
-            projection_ty: ProjectionTy {
-                associated_ty_id: to_assoc_type_id(alias.id),
-                substitution: subst,
-            },
-            ty: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner),
-        };
         let goal = Canonical {
             value: InEnvironment::new(
                 self.ty.environment.clone(),
-                Obligation::Projection(predicate),
+                Obligation::AliasEq(AliasEq {
+                    alias: AliasTy::Projection(ProjectionTy {
+                        associated_ty_id: to_assoc_type_id(alias.id),
+                        substitution: subst,
+                    }),
+                    ty: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0))
+                        .intern(&Interner),
+                }),
             ),
             kinds: Arc::new([TyVariableKind::General]),
         };
@@ -2019,7 +2023,7 @@ impl Type {
             it.into_iter()
                 .filter_map(|pred| match pred {
                     hir_ty::GenericPredicate::Implemented(trait_ref) => {
-                        Some(Trait::from(trait_ref.trait_))
+                        Some(Trait::from(trait_ref.hir_trait_id()))
                     }
                     _ => None,
                 })
@@ -2063,7 +2067,7 @@ impl Type {
                 match pred {
                     GenericPredicate::Implemented(trait_ref) => {
                         cb(type_.clone());
-                        walk_substs(db, type_, &trait_ref.substs, cb);
+                        walk_substs(db, type_, &trait_ref.substitution, cb);
                     }
                     _ => (),
                 }