diff options
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs index 55eb0ffcb..60d70d18e 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/ra_hir_ty/src/traits/chalk.rs | |||
@@ -511,13 +511,13 @@ impl ToChalk for ProjectionTy { | |||
511 | } | 511 | } |
512 | 512 | ||
513 | impl ToChalk for super::ProjectionPredicate { | 513 | impl ToChalk for super::ProjectionPredicate { |
514 | type Chalk = chalk_ir::Normalize<Interner>; | 514 | type Chalk = chalk_ir::AliasEq<Interner>; |
515 | 515 | ||
516 | fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Normalize<Interner> { | 516 | fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::AliasEq<Interner> { |
517 | chalk_ir::Normalize { alias: self.projection_ty.to_chalk(db), ty: self.ty.to_chalk(db) } | 517 | chalk_ir::AliasEq { alias: self.projection_ty.to_chalk(db), ty: self.ty.to_chalk(db) } |
518 | } | 518 | } |
519 | 519 | ||
520 | fn from_chalk(_db: &dyn HirDatabase, _normalize: chalk_ir::Normalize<Interner>) -> Self { | 520 | fn from_chalk(_db: &dyn HirDatabase, _normalize: chalk_ir::AliasEq<Interner>) -> Self { |
521 | unimplemented!() | 521 | unimplemented!() |
522 | } | 522 | } |
523 | } | 523 | } |
@@ -795,8 +795,9 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> { | |||
795 | fn well_known_trait_id( | 795 | fn well_known_trait_id( |
796 | &self, | 796 | &self, |
797 | _well_known_trait: chalk_rust_ir::WellKnownTrait, | 797 | _well_known_trait: chalk_rust_ir::WellKnownTrait, |
798 | ) -> chalk_ir::TraitId<Interner> { | 798 | ) -> Option<chalk_ir::TraitId<Interner>> { |
799 | unimplemented!() | 799 | // FIXME tell Chalk about well-known traits (here and in trait_datum) |
800 | None | ||
800 | } | 801 | } |
801 | } | 802 | } |
802 | 803 | ||