Merge pull request #57 from honeypotio/conditional-search

Conditional search
honeypotio · Feb 28, 2018 · 154724c · 154724c
2 parents 171ede4 + 24fd827
commit 154724c
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 152 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ persistent   = "0.4"
 unicase      = "1.0"
 
 lazy_static  = "1.0"
-maplit       = "1.0"
 oath         = "0.10"
 log          = "0.3"
 rollbar      = "0.4"
@@ -30,7 +29,7 @@ serde        = "1.0"
 serde_json   = "1.0"
 serde_derive = "1.0"
 
-rs-es = "0.10"
+rs-es = { git = "https://github.com/RoxasShadow/rs-es.git", branch = "one-request-mapping" }
 
 [lib]
 name = "searchspot"

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,5 @@
 #![feature(conservative_impl_trait, iterator_for_each)]
+#![recursion_limit="128"]
 
 extern crate serde;
 #[macro_use] extern crate serde_json;
@@ -17,7 +18,6 @@ extern crate oath;
 extern crate rollbar;
 extern crate backtrace;
 #[macro_use] extern crate log;
-#[macro_use] extern crate maplit;
 
 // this macro is needed by resources/talent.rs
 // but moving it to resources/mod raises E0468