aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty/src/traits
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-03-03 11:16:45 +0000
committerGitHub <[email protected]>2020-03-03 11:16:45 +0000
commit9bc9e12cc52ed7dbefa9812133d1902b4bd983dc (patch)
tree35a595f6c221cd4dfad24ac7ba972c2814d5c82e /crates/ra_hir_ty/src/traits
parentb358fe19d73c80df31cf9c70f35a4e2c8b280fc4 (diff)
parent91e02ace0660640b5cadd86f9c6c323a0c300f9d (diff)
Merge #3417
3417: Drop larlpop-intern dependency r=matklad a=lnicola Co-authored-by: LaurenČ›iu Nicola <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/traits')
-rw-r--r--crates/ra_hir_ty/src/traits/chalk.rs4
1 files changed, 2 insertions, 2 deletions
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)