Merge pull request #432 from Mcat12/tweak/replace-lalrpop-intern

Replace lalrpop-intern with string_cache

Author: jackh726

.gitignore

@@ -9,3 +9,6 @@ TAGS
 *~
 target
 chalk-parse/src/parser.rs
+
+## IDE files
+/.idea/

Cargo.lock

@@ -16,7 +16,6 @@ bench = []
 [dependencies]
 docopt = "1.0.0"
 itertools = "0.9.0"
-lalrpop-intern = "0.15.1"
 rustyline = "1.0"
 salsa = "0.10.0"
 serde = "1.0"

Cargo.toml

@@ -10,13 +10,13 @@ edition = "2018"
 publish = false
 
 [dependencies]
-lalrpop-intern = "0.15.1"
+string_cache = "0.8.0"
 salsa = "0.10.0"
 
 chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine" }
-chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir", features = ["default-interner"] }
+chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir" }
 chalk-rust-ir = { version = "0.10.1-dev", path = "../chalk-rust-ir" }
 chalk-solve = { version = "0.10.1-dev", path = "../chalk-solve" }
 chalk-parse = { version = "0.10.1-dev", path = "../chalk-parse" }

chalk-integration/Cargo.toml

@@ -1,10 +1,10 @@
 use crate::error::ChalkError;
+use crate::interner::ChalkIr;
 use crate::lowering::LowerGoal;
 use crate::program::Program;
 use crate::query::{Lowering, LoweringDatabase};
+use crate::tls;
 use chalk_engine::forest::SubstitutionResult;
-use chalk_ir::interner::ChalkIr;
-use chalk_ir::tls;
 use chalk_ir::AssocTypeId;
 use chalk_ir::Canonical;
 use chalk_ir::ConstrainedSubst;

chalk-integration/src/db.rs

@@ -1,4 +1,4 @@
-use chalk_ir::interner::ChalkIr;
+use crate::interner::ChalkIr;
 use chalk_parse::ast::{Identifier, Kind};
 use chalk_solve::coherence::CoherenceError;
 use chalk_solve::wf::WfError;