Merge #3417

3417: Drop larlpop-intern dependency r=matklad a=lnicola



Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>

Cargo.lock

@@ -599,12 +599,6 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "lalrpop-intern"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4fd87be4a815fd373e02773983940f0d75fb26fde8c098e9e45f7af03154c0"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1023,7 +1017,6 @@ dependencies = [
  "chalk-solve",
  "ena",
  "insta",
- "lalrpop-intern",
  "log",
  "ra_arena",
  "ra_db",

crates/ra_hir_ty/Cargo.toml

@@ -25,7 +25,5 @@ chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "177d713
 chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" }
 chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" }
 
-lalrpop-intern = "0.15.1"
-
 [dev-dependencies]
 insta = "0.13.1"

crates/ra_hir_ty/src/traits/chalk.rs

@@ -27,7 +27,7 @@ impl chalk_ir::interner::Interner for Interner {
     type InternedGoal = Arc<GoalData<Self>>;
     type InternedGoals = Vec<Goal<Self>>;
     type InternedSubstitution = Vec<Parameter<Self>>;
-    type Identifier = lalrpop_intern::InternedString;
+    type Identifier = TypeAliasId;
     type DefId = InternId;
 
     // FIXME: implement these
@@ -636,7 +636,7 @@ pub(crate) fn associated_ty_data_query(
     let datum = AssociatedTyDatum {
         trait_id: trait_.to_chalk(db),
         id,
-        name: lalrpop_intern::intern(&db.type_alias_data(type_alias).name.to_string()),
+        name: type_alias,
         binders: make_binders(bound_data, generic_params.len()),
     };
     Arc::new(datum)