Skip to content

Commit 22b6c49

Browse files
committed
Replace lalrpop-intern with string_cache
string_cache::Atom does not implement Copy, so the majority of the changes are adding calls to clone.
1 parent 0a4dd04 commit 22b6c49

File tree

9 files changed

+113
-86
lines changed

9 files changed

+113
-86
lines changed

Cargo.lock

Lines changed: 30 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ bench = []
1616
[dependencies]
1717
docopt = "1.0.0"
1818
itertools = "0.9.0"
19-
lalrpop-intern = "0.15.1"
2019
rustyline = "1.0"
2120
salsa = "0.10.0"
2221
serde = "1.0"

chalk-integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
publish = false
1111

1212
[dependencies]
13-
lalrpop-intern = "0.15.1"
13+
string_cache = "0.8.0"
1414
salsa = "0.10.0"
1515

1616
chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }

chalk-integration/src/interner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ use chalk_ir::{
99
Goal, GoalData, LifetimeData, Parameter, ParameterData, ParameterKind, ProgramClause,
1010
ProgramClauseData, QuantifiedWhereClause, StructId, TyData, UniverseIndex,
1111
};
12-
use lalrpop_intern::InternedString;
1312
use std::fmt;
1413
use std::fmt::Debug;
1514
use std::sync::Arc;
15+
use string_cache::DefaultAtom;
1616

17-
pub type Identifier = InternedString;
17+
pub type Identifier = DefaultAtom;
1818

1919
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
2020
pub struct RawId {

0 commit comments

Comments
 (0)