Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #3417

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



Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2020-03-03 11:16:45 +00:00 committed by GitHub
commit 9bc9e12cc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cargo.lock generated
View file

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

2
crates/ra_hir_ty/Cargo.toml
View file

@ -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-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "177d71340acc7a7204a33115fc63075d86452179" }
chalk-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] [dev-dependencies]
insta = "0.13.1" insta = "0.13.1"

4
crates/ra_hir_ty/src/traits/chalk.rs
View file

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