From a0a481697bc9e51b4e5868c41df9ccef9547ed4c Mon Sep 17 00:00:00 2001 From: mposmta Date: Thu, 9 Apr 2020 14:30:16 +0200 Subject: [PATCH] replace lazy_static with once_cell --- Cargo.lock | 5 ++--- meilisearch-core/Cargo.toml | 3 +-- meilisearch-core/src/filters/parser/mod.rs | 14 ++++++-------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 223d0bc0a..b47eb42fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1087,7 +1087,6 @@ dependencies = [ "intervaltree", "itertools 0.9.0", "jemallocator", - "lazy_static", "levenshtein_automata", "log", "meilisearch-schema", @@ -1095,7 +1094,7 @@ dependencies = [ "meilisearch-types", "once_cell", "ordered-float", - "pest 2.1.3 (git+https://github.com/MarinPostma/pest.git)", + "pest 2.1.3 (git+https://github.com/MarinPostma/pest.git?tag=meilisearch-patch1)", "pest_derive", "regex", "rustyline", @@ -1406,7 +1405,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pest" version = "2.1.3" -source = "git+https://github.com/MarinPostma/pest.git#e1031ad0134d5e9893c470dbea50811b2b746926" +source = "git+https://github.com/MarinPostma/pest.git?tag=meilisearch-patch1#e1031ad0134d5e9893c470dbea50811b2b746926" dependencies = [ "ucd-trie", ] diff --git a/meilisearch-core/Cargo.toml b/meilisearch-core/Cargo.toml index b9a0c0fb4..51679dc8d 100644 --- a/meilisearch-core/Cargo.toml +++ b/meilisearch-core/Cargo.toml @@ -20,7 +20,6 @@ heed = "0.7.0" indexmap = { version = "1.3.2", features = ["serde-1"] } intervaltree = "0.2.5" itertools = "0.9.0" -lazy_static = "1.4.0" levenshtein_automata = { version = "0.1.1", features = ["fst_automaton"] } log = "0.4.8" meilisearch-schema = { path = "../meilisearch-schema", version = "0.9.0" } @@ -28,7 +27,7 @@ meilisearch-tokenizer = { path = "../meilisearch-tokenizer", version = "0.9.0" } meilisearch-types = { path = "../meilisearch-types", version = "0.9.0" } once_cell = "1.3.1" ordered-float = { version = "1.0.2", features = ["serde"] } -pest = {git = "https://github.com/MarinPostma/pest.git"} +pest = { git = "https://github.com/MarinPostma/pest.git", tag = "meilisearch-patch1" } pest_derive = "2.0" regex = "1.3.6" sdset = "0.4.0" diff --git a/meilisearch-core/src/filters/parser/mod.rs b/meilisearch-core/src/filters/parser/mod.rs index efe29a17a..e8f69d0dd 100644 --- a/meilisearch-core/src/filters/parser/mod.rs +++ b/meilisearch-core/src/filters/parser/mod.rs @@ -1,13 +1,11 @@ -use lazy_static::lazy_static; +use once_cell::sync::Lazy; use pest::prec_climber::{Operator, Assoc, PrecClimber}; -lazy_static! { - pub static ref PREC_CLIMBER: PrecClimber = { - use Assoc::*; - use Rule::*; - pest::prec_climber::PrecClimber::new(vec![Operator::new(or, Left), Operator::new(and, Left)]) - }; -} +pub static PREC_CLIMBER: Lazy> = Lazy::new(|| { + use Assoc::*; + use Rule::*; + pest::prec_climber::PrecClimber::new(vec![Operator::new(or, Left), Operator::new(and, Left)]) +}); #[derive(Parser)] #[grammar = "filters/parser/grammar.pest"]