diff options
Diffstat (limited to 'crates/ra_hir_ty')
-rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 202eca507..f2558b579 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml | |||
@@ -25,7 +25,5 @@ chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "177d713 | |||
25 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" } | 25 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" } |
26 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" } | 26 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" } |
27 | 27 | ||
28 | lalrpop-intern = "0.15.1" | ||
29 | |||
30 | [dev-dependencies] | 28 | [dev-dependencies] |
31 | insta = "0.13.1" | 29 | insta = "0.13.1" |
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs index 7f7fe93b7..62509bc29 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/ra_hir_ty/src/traits/chalk.rs | |||
@@ -27,7 +27,7 @@ impl chalk_ir::interner::Interner for Interner { | |||
27 | type InternedGoal = Arc<GoalData<Self>>; | 27 | type InternedGoal = Arc<GoalData<Self>>; |
28 | type InternedGoals = Vec<Goal<Self>>; | 28 | type InternedGoals = Vec<Goal<Self>>; |
29 | type InternedSubstitution = Vec<Parameter<Self>>; | 29 | type InternedSubstitution = Vec<Parameter<Self>>; |
30 | type Identifier = lalrpop_intern::InternedString; | 30 | type Identifier = TypeAliasId; |
31 | type DefId = InternId; | 31 | type DefId = InternId; |
32 | 32 | ||
33 | // FIXME: implement these | 33 | // FIXME: implement these |
@@ -636,7 +636,7 @@ pub(crate) fn associated_ty_data_query( | |||
636 | let datum = AssociatedTyDatum { | 636 | let datum = AssociatedTyDatum { |
637 | trait_id: trait_.to_chalk(db), | 637 | trait_id: trait_.to_chalk(db), |
638 | id, | 638 | id, |
639 | name: lalrpop_intern::intern(&db.type_alias_data(type_alias).name.to_string()), | 639 | name: type_alias, |
640 | binders: make_binders(bound_data, generic_params.len()), | 640 | binders: make_binders(bound_data, generic_params.len()), |
641 | }; | 641 | }; |
642 | Arc::new(datum) | 642 | Arc::new(datum) |