Merge pull request #36 from Kerollmops/clean-up-deps

Clean up dependencies and avoid custom ones

Cargo.toml

@@ -7,28 +7,23 @@ authors = ["Kerollmops <renault.cle@gmail.com>"]
 [dependencies]
 bincode = "1.0"
 byteorder = "1.2"
+fst = "0.3"
 hashbrown = "0.1"
 lazy_static = "1.1"
+levenshtein_automata = { version = "0.1", features = ["fst_automaton"] }
 linked-hash-map = { version = "0.5", features = ["serde_impl"] }
 sdset = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
 unidecode = "0.3"
 
-[dependencies.fst]
-git = "https://github.com/Kerollmops/fst.git"
-branch = "automaton-for-deref"
-
-[dependencies.levenshtein_automata]
-git = "https://github.com/Kerollmops/levenshtein-automata.git"
-branch = "new-custom-fst"
-features = ["fst_automaton"]
-
 [dependencies.rocksdb]
 git = "https://github.com/pingcap/rust-rocksdb.git"
+rev = "c2eb140"
 
 [dependencies.group-by]
 git = "https://github.com/Kerollmops/group-by.git"
+rev = "cab857b"
 
 [features]
 default = ["simd"]

src/automaton.rs

@@ -1,5 +1,3 @@
-use std::ops::Deref;
-
 use fst::Automaton;
 use lazy_static::lazy_static;
 use levenshtein_automata::{
@@ -90,16 +88,3 @@ pub trait AutomatonExt: Automaton {
     fn eval<B: AsRef<[u8]>>(&self, s: B) -> Distance;
     fn query_len(&self) -> usize;
 }
-
-impl<T> AutomatonExt for T
-where T: Deref,
-      T::Target: AutomatonExt,
-{
-    fn eval<B: AsRef<[u8]>>(&self, s: B) -> Distance {
-        (**self).eval(s)
-    }
-
-    fn query_len(&self) -> usize {
-        (**self).query_len()
-    }
-}