Merge #325

325: Update milli version to v0.11.0 r=curquiza a=Kerollmops This PR also clean-up some dependencies in the Cargo.toml. Co-authored-by: Kerollmops <clement@meilisearch.com>
meilisearch · Aug 24, 2021 · c51bb67 · c51bb67
2 parents 794c0f6 + af65485
commit c51bb67
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/helpers/Cargo.toml b/helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helpers"
-version = "0.10.2"
+version = "0.11.0"
 authors = ["Clément Renault <clement@meilisearch.com>"]
 edition = "2018"
 

diff --git a/http-ui/Cargo.toml b/http-ui/Cargo.toml
@@ -1,15 +1,14 @@
 [package]
 name = "http-ui"
 description = "The HTTP user interface of the milli search engine"
-version = "0.10.2"
+version = "0.11.0"
 authors = ["Clément Renault <clement@meilisearch.com>"]
 edition = "2018"
 
 [dependencies]
 anyhow = "1.0.38"
 byte-unit = { version = "4.0.9", default-features = false, features = ["std"] }
 crossbeam-channel = "0.5.0"
-grenad = { git = "https://github.com/Kerollmops/grenad.git", rev = "3adcb26" }
 heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.1" }
 meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" }
 memmap = "0.7.0"

diff --git a/http-ui/src/main.rs b/http-ui/src/main.rs
@@ -16,12 +16,11 @@ use byte_unit::Byte;
 use either::Either;
 use flate2::read::GzDecoder;
 use futures::{stream, FutureExt, StreamExt};
-use grenad::CompressionType;
 use heed::EnvOpenOptions;
 use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
 use milli::update::UpdateIndexingStep::*;
 use milli::update::{IndexDocumentsMethod, Setting, UpdateBuilder, UpdateFormat};
-use milli::{obkv_to_json, FilterCondition, Index, MatchingWords, SearchResult};
+use milli::{obkv_to_json, CompressionType, FilterCondition, Index, MatchingWords, SearchResult};
 use once_cell::sync::OnceCell;
 use rayon::ThreadPool;
 use serde::{Deserialize, Serialize};

diff --git a/infos/Cargo.toml b/infos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "infos"
-version = "0.10.2"
+version = "0.11.0"
 authors = ["Clément Renault <clement@meilisearch.com>"]
 edition = "2018"
 

diff --git a/milli/Cargo.toml b/milli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "milli"
-version = "0.10.2"
+version = "0.11.0"
 authors = ["Kerollmops <clement@meilisearch.com>"]
 edition = "2018"
 
@@ -45,10 +45,6 @@ itertools = "0.10.0"
 log = "0.4.14"
 logging_timer = "1.0.0"
 
-# We temporarily depend on this crate just to fix this issue
-# https://github.com/bheisler/TinyTemplate/pull/17
-tinytemplate = "=1.1.0"
-
 [dev-dependencies]
 big_s = "1.0.2"
 maplit = "1.0.2"

diff --git a/milli/src/lib.rs b/milli/src/lib.rs
@@ -20,6 +20,7 @@ use std::hash::BuildHasherDefault;
 use std::result::Result as StdResult;
 
 use fxhash::{FxHasher32, FxHasher64};
+pub use grenad::CompressionType;
 use serde_json::{Map, Value};
 
 pub use self::criterion::{default_criteria, AscDesc, Criterion};

diff --git a/search/Cargo.toml b/search/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "search"
-version = "0.10.2"
+version = "0.11.0"
 authors = ["Clément Renault <clement@meilisearch.com>"]
 edition = "2018"