chore: Remove the unused lalrpop-intern crate

Cargo.lock

@@ -6,6 +6,11 @@ dependencies = [
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "ascii-canvas"
 version = "1.0.0"
@@ -43,11 +48,25 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "calculator"
+name = "block-buffer"
-version = "0.15.1"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lalrpop 0.15.1",
+ "arrayref 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop-util 0.15.1",
+ "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "byte-tools"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "calculator"
+version = "0.15.2"
+dependencies = [
+ "lalrpop 0.15.2",
+ "lalrpop-util 0.15.2",
  "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -64,6 +83,14 @@ name = "diff"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "digest"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "docopt"
 version = "0.8.3"
@@ -86,6 +113,11 @@ name = "ena"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fixedbitset"
 version = "0.1.8"
@@ -105,6 +137,14 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "generic-array"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itertools"
 version = "0.7.8"
@@ -124,35 +164,33 @@ dependencies = [
 
 [[package]]
 name = "lalrpop"
-version = "0.15.1"
+version = "0.15.2"
 dependencies = [
  "ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ena 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop-snap 0.15.1",
+ "lalrpop-snap 0.15.2",
- "lalrpop-util 0.15.1",
+ "lalrpop-util 0.15.2",
  "petgraph 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "lalrpop-intern"
-version = "0.15.1"
-
 [[package]]
 name = "lalrpop-snap"
-version = "0.15.1"
+version = "0.15.2"
 dependencies = [
  "ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -160,8 +198,7 @@ dependencies = [
  "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "ena 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop-intern 0.15.1",
+ "lalrpop-util 0.15.2",
- "lalrpop-util 0.15.1",
  "petgraph 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -173,17 +210,17 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-test"
-version = "0.15.1"
+version = "0.15.2"
 dependencies = [
  "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop 0.15.1",
+ "lalrpop 0.15.2",
- "lalrpop-util 0.15.1",
+ "lalrpop-util 0.15.2",
  "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.15.1"
+version = "0.15.2"
 
 [[package]]
 name = "lazy_static"
@@ -213,8 +250,8 @@ name = "pascal"
 version = "0.11.0"
 dependencies = [
  "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop 0.15.1",
+ "lalrpop 0.15.2",
- "lalrpop-util 0.15.1",
+ "lalrpop-util 0.15.2",
  "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -342,6 +379,17 @@ dependencies = [
  "syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "siphasher"
 version = "0.2.2"
@@ -410,6 +458,11 @@ dependencies = [
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "ucd-util"
 version = "0.1.1"
@@ -448,10 +501,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "whitespace"
-version = "0.15.1"
+version = "0.15.2"
 dependencies = [
- "lalrpop 0.15.1",
+ "lalrpop 0.15.2",
- "lalrpop-util 0.15.1",
+ "lalrpop-util 0.15.2",
 ]
 
 [[package]]
@@ -485,19 +538,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
+"checksum arrayref 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0fd1479b7c29641adbd35ff3b5c293922d696a92f25c8c975da3e0acbc87258f"
 "checksum ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b385d69402821a1c254533a011a312531cbcc0e3e24f19bbb4747a5a2daf37e2"
 "checksum atty 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d0fd4c0631f06448cc45a6bbb3b710ebb7ff8ccb96a0800c994afe23a70d5df2"
 "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c"
 "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
 "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
+"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
+"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
 "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
+"checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603"
 "checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a"
 "checksum either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740178ddf48b1a9e878e6d6509a1442a2d42fd2928aae8e7a6f8a36fb01981b3"
 "checksum ena 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe5a5078ac8c506d3e4430763b1ba9b609b1286913e7d08e581d1c2de9b7e5"
+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum fixedbitset 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "85cb8fec437468d86dc7c83ca7cfc933341d561873275f22dd5eedefa63a6478"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
 "checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
@@ -519,6 +578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "0e100d00fb985a5bf16b857a436450e404fa613de3321b2e383947a93cbd75df"
 "checksum serde_derive 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "86daebd995aa948b069d886f2105f2425cd66103049855e45c15c58c573f12c5"
 "checksum serde_derive_internals 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3f714f52a41e371c5e141e9dafcead60921349bec76b44d79000c88aba3cfc"
+"checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 "checksum string_cache 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39cb4173bcbd1319da31faa5468a7e3870683d7a237150b0b0aaafd546f6ad12"
 "checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7"
@@ -527,6 +587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8c5bc2d6ff27891209efa5f63e9de78648d7801f085e4653701a692ce938d6fd"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
+"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
 "checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"

Cargo.toml

@@ -3,7 +3,6 @@ members = [
         "lalrpop",
         "lalrpop-test",
         "lalrpop-snap",
-        "lalrpop-intern",
         "lalrpop-util",
         "doc/calculator",
         "doc/pascal/lalrpop",

lalrpop-intern/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "lalrpop-intern"
-version = "0.15.1" # LALRPOP
-description = "Simple string interner used by LALRPOP"
-repository = "https://github.com/lalrpop/lalrpop"
-license = "Apache-2.0/MIT"
-authors = ["Niko Matsakis <niko@alum.mit.edu>"]
-workspace = ".."

lalrpop-intern/src/lib.rs

@@ -1,100 +0,0 @@
-use std::collections::HashMap;
-use std::cell::RefCell;
-use std::fmt::{Debug, Display, Error, Formatter};
-use std::cmp::{Ord, Ordering, PartialOrd};
-
-#[cfg(test)]
-mod test;
-
-thread_local! {
-    static INTERNER_TLS: RefCell<Interner> =
-        RefCell::new(Interner::new())
-}
-
-pub struct Interner {
-    map: HashMap<String, InternedString>,
-    strings: Vec<String>,
-}
-
-#[derive(Copy, Clone, Hash, Eq, PartialEq)]
-pub struct InternedString {
-    index: u32,
-}
-
-pub fn intern(s: &str) -> InternedString {
-    write(|interner| {
-        match interner.map.get(s) {
-            Some(&v) => {
-                return v;
-            }
-            None => {}
-        }
-
-        let index = interner.strings.len() as u32;
-        let result = InternedString { index: index };
-        interner.map.insert(s.to_string(), result);
-        interner.strings.push(s.to_string());
-        return result;
-    })
-}
-
-pub fn read<F, R>(f: F) -> R
-where
-    F: FnOnce(&Interner) -> R,
-{
-    INTERNER_TLS.with(|interner| f(&*interner.borrow()))
-}
-
-fn write<F, R>(f: F) -> R
-where
-    F: FnOnce(&mut Interner) -> R,
-{
-    INTERNER_TLS.with(|interner| f(&mut *interner.borrow_mut()))
-}
-
-impl Interner {
-    fn new() -> Interner {
-        Interner {
-            map: HashMap::new(),
-            strings: vec![],
-        }
-    }
-
-    pub fn data(&self, i: InternedString) -> &str {
-        &self.strings[i.index()]
-    }
-}
-
-impl InternedString {
-    fn index(&self) -> usize {
-        self.index as usize
-    }
-
-    pub fn len(&self) -> usize {
-        read(|interner| interner.data(*self).len())
-    }
-}
-
-impl Debug for InternedString {
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
-        read(|interner| Debug::fmt(&interner.data(*self), fmt))
-    }
-}
-
-impl Display for InternedString {
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
-        read(|interner| Display::fmt(&interner.data(*self), fmt))
-    }
-}
-
-impl PartialOrd<InternedString> for InternedString {
-    fn partial_cmp(&self, other: &InternedString) -> Option<Ordering> {
-        read(|interner| PartialOrd::partial_cmp(interner.data(*self), interner.data(*other)))
-    }
-}
-
-impl Ord for InternedString {
-    fn cmp(&self, other: &InternedString) -> Ordering {
-        read(|interner| Ord::cmp(interner.data(*self), interner.data(*other)))
-    }
-}

lalrpop-intern/src/test.rs

@@ -1,23 +0,0 @@
-use super::intern;
-
-#[test]
-fn basic() {
-    let i = intern("hello");
-    let j = intern("world");
-    assert!(i != j);
-    assert_eq!(intern("hello"), i);
-    assert_eq!(i.to_string(), "hello");
-    assert_eq!(j.to_string(), "world");
-}
-
-#[test]
-fn debug() {
-    let i = intern("hello");
-    assert_eq!(format!("{:?}", i), "\"hello\"");
-}
-
-#[test]
-fn display() {
-    let i = intern("hello");
-    assert_eq!(format!("{}", i), "hello");
-}

lalrpop-snap/Cargo.toml

@@ -35,6 +35,3 @@ rand = "0.4"
 path = "../lalrpop-util"
 version = "0.15.1" # LALRPOP
 
-[dependencies.lalrpop-intern]
-path = "../lalrpop-intern"
-version = "0.15.1" # LALRPOP

publish.sh

@@ -35,7 +35,6 @@ function publish {
     printf "OK\n"
 }
 
-publish lalrpop-intern
 publish lalrpop-util
 publish lalrpop-snap
 publish lalrpop