diff options
author | Laurențiu Nicola <[email protected]> | 2020-03-03 05:57:16 +0000 |
---|---|---|
committer | Laurențiu Nicola <[email protected]> | 2020-03-03 05:57:16 +0000 |
commit | 91e02ace0660640b5cadd86f9c6c323a0c300f9d (patch) | |
tree | 53df3a82f4f3653d8089867f230f486f8a7b6e52 | |
parent | ce5684216eda52a6da6a2933a980bd5655da61b8 (diff) |
Drop larlpop-intern dep
-rw-r--r-- | Cargo.lock | 7 | ||||
-rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk.rs | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index cab28ad49..373e176b0 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -600,12 +600,6 @@ dependencies = [ | |||
600 | ] | 600 | ] |
601 | 601 | ||
602 | [[package]] | 602 | [[package]] |
603 | name = "lalrpop-intern" | ||
604 | version = "0.15.1" | ||
605 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
606 | checksum = "cc4fd87be4a815fd373e02773983940f0d75fb26fde8c098e9e45f7af03154c0" | ||
607 | |||
608 | [[package]] | ||
609 | name = "lazy_static" | 603 | name = "lazy_static" |
610 | version = "1.4.0" | 604 | version = "1.4.0" |
611 | source = "registry+https://github.com/rust-lang/crates.io-index" | 605 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1023,7 +1017,6 @@ dependencies = [ | |||
1023 | "chalk-solve", | 1017 | "chalk-solve", |
1024 | "ena", | 1018 | "ena", |
1025 | "insta", | 1019 | "insta", |
1026 | "lalrpop-intern", | ||
1027 | "log", | 1020 | "log", |
1028 | "ra_arena", | 1021 | "ra_arena", |
1029 | "ra_db", | 1022 | "ra_db", |
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) |