Merge #1165

1165: Bumps r=MarinPostma a=MarinPostma



Co-authored-by: mpostma <postma.marin@protonmail.com>

meilisearch-core/Cargo.toml

@@ -6,24 +6,24 @@ authors = ["Kerollmops <clement@meilisearch.com>"]
 edition = "2018"
 
 [dependencies]
-arc-swap = "0.4.5"
+arc-swap = "1.2.0"
-bincode = "1.2.1"
+bincode = "1.3.1"
 byteorder = "1.3.4"
 chrono = { version = "0.4.19", features = ["serde"] }
-compact_arena = "0.4.0"
+compact_arena = "0.4.1"
 cow-utils = "0.1.2"
 crossbeam-channel = "0.5.0"
-deunicode = "1.1.0"
+deunicode = "1.1.1"
-either = "1.5.3"
+either = "1.6.1"
 env_logger = "0.8.2"
-fst = "0.4.4"
+fst = "0.4.5"
-hashbrown = { version = "0.9.0", features = ["serde"] }
+hashbrown = { version = "0.9.1", features = ["serde"] }
-heed = "0.10.5"
+heed = "0.10.6"
-indexmap = { version = "1.3.2", features = ["serde-1"] }
+indexmap = { version = "1.6.1", features = ["serde-1"] }
-intervaltree = "0.2.5"
+intervaltree = "0.2.6"
-itertools = "0.9.0"
+itertools = "0.10.0"
 levenshtein_automata = { version = "0.2.0", features = ["fst_automaton"] }
-log = "0.4.8"
+log = "0.4.11"
 meilisearch-error = { path = "../meilisearch-error", version = "0.17.0" }
 meilisearch-schema = { path = "../meilisearch-schema", version = "0.17.0" }
 meilisearch-tokenizer = { path = "../meilisearch-tokenizer", version = "0.17.0" }
@@ -31,23 +31,23 @@ meilisearch-types = { path = "../meilisearch-types", version = "0.17.0" }
 once_cell = "1.5.2"
 ordered-float = { version = "2.0.1", features = ["serde"] }
 pest = { git = "https://github.com/pest-parser/pest.git", rev = "51fd1d49f1041f7839975664ef71fe15c7dcaf67" }
-pest_derive = "2.0"
+pest_derive = "2.1.0"
 regex = "1.4.2"
 sdset = "0.4.0"
-serde = { version = "1.0.117", features = ["derive"] }
+serde = { version = "1.0.118", features = ["derive"] }
-serde_json = { version = "1.0.59", features = ["preserve_order"] }
+serde_json = { version = "1.0.61", features = ["preserve_order"] }
 slice-group-by = "0.2.6"
 unicase = "2.6.0"
 zerocopy = "0.3.0"
 
 [dev-dependencies]
 assert_matches = "1.4.0"
-criterion = "0.3.1"
+criterion = "0.3.3"
-csv = "1.1.3"
+csv = "1.1.5"
-rustyline = { version = "7.0.0", default-features = false }
+rustyline = { version = "7.1.0", default-features = false }
-structopt = "0.3.20"
+structopt = "0.3.21"
 tempfile = "3.1.0"
-termcolor = "1.1.0"
+termcolor = "1.1.2"
 
 [target.'cfg(unix)'.dev-dependencies]
 jemallocator = "0.3.2"

meilisearch-error/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["marin <postma.marin@protonmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-http = "2"
+actix-http = "2.2.0"

meilisearch-http/Cargo.toml

@@ -17,43 +17,43 @@ path = "src/main.rs"
 default = ["sentry"]
 
 [dependencies]
-actix-cors = "0.5.3"
+actix-cors = "0.5.4"
-actix-http = "2"
+actix-http = "2.2.0"
-actix-rt = "1"
+actix-rt = "1.1.1"
 actix-service = "1.0.6"
 actix-web = { version = "3.3.2", features = ["rustls"] }
-bytes = "0.6.0"
+bytes = "1.0.0"
 chrono = { version = "0.4.19", features = ["serde"] }
 crossbeam-channel = "0.5.0"
 env_logger = "0.8.2"
-flate2 = "1.0.18"
+flate2 = "1.0.19"
-futures = "0.3.7"
+futures = "0.3.8"
-http = "0.2.1"
+http = "0.2.2"
-indexmap = { version = "1.3.2", features = ["serde-1"] }
+indexmap = { version = "1.6.1", features = ["serde-1"] }
-log = "0.4.8"
+log = "0.4.11"
-main_error = "0.1.0"
+main_error = "0.1.1"
 meilisearch-core = { path = "../meilisearch-core", version = "0.17.0" }
 meilisearch-error = { path = "../meilisearch-error", version = "0.17.0" }
 meilisearch-schema = { path = "../meilisearch-schema", version = "0.17.0" }
 meilisearch-tokenizer = {path = "../meilisearch-tokenizer", version = "0.17.0"}
 mime = "0.3.16"
 once_cell = "1.5.2"
-rand = "0.7.3"
+rand = "0.8.1"
 regex = "1.4.2"
-rustls = "0.18"
+rustls = "0.18.0"
-serde = { version = "1.0.117", features = ["derive"] }
+serde = { version = "1.0.118", features = ["derive"] }
-serde_json = { version = "1.0.59", features = ["preserve_order"] }
+serde_json = { version = "1.0.61", features = ["preserve_order"] }
-serde_qs = "0.8.1"
+serde_qs = "0.8.2"
-sha2 = "0.9.1"
+sha2 = "0.9.2"
-siphasher = "0.3.2"
+siphasher = "0.3.3"
 slice-group-by = "0.2.6"
-structopt = "0.3.20"
+structopt = "0.3.21"
-tar = "0.4.29"
+tar = "0.4.30"
 tempfile = "3.1.0"
-tokio = { version = "0.2.18", features = ["macros"] }
+tokio = { version = "0.2", features = ["macros"] }
-ureq = { version = "1.5.1", features = ["tls"], default-features = false }
+ureq = { version = "2.0.0", features = ["tls"], default-features = false }
 walkdir = "2.3.1"
-whoami = "1.0.0"
+whoami = "1.0.3"
 
 [dependencies.sentry]
 version = "0.18.1"
@@ -73,7 +73,7 @@ optional = true
 [dev-dependencies]
 serde_url_params = "0.2.0"
 tempdir = "0.3.7"
-tokio = { version = "0.2.18", features = ["macros", "time"] }
+tokio = { version = "0.2", features = ["macros", "time"] }
 
 [dev-dependencies.assert-json-diff]
 git = "https://github.com/qdequele/assert-json-diff"

meilisearch-http/src/analytics.rs

@@ -127,9 +127,14 @@ pub fn analytics_sender(data: Data, opt: Opt) {
 
         let body = qs::to_string(&request).unwrap();
         let response = ureq::post("https://api.amplitude.com/httpapi").send_string(&body);
-        if !response.ok() {
+        match response {
-            let body = response.into_string().unwrap();
+            Err(ureq::Error::Status(_ , response)) => {
-            error!("Unsuccessful call to Amplitude: {}", body);
+                error!("Unsuccessful call to Amplitude: {}", response.into_string().unwrap_or_default());
+            }
+            Err(e) => {
+                error!("Unsuccessful call to Amplitude: {}", e);
+            }
+            _ => (),
         }
 
         thread::sleep(Duration::from_secs(3600)) // one hour

meilisearch-schema/Cargo.toml

@@ -6,8 +6,8 @@ authors = ["Kerollmops <renault.cle@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-indexmap = { version = "1.3.2", features = ["serde-1"] }
+indexmap = { version = "1.6.1", features = ["serde-1"] }
 meilisearch-error = { path = "../meilisearch-error", version = "0.17.0" }
-serde = { version = "1.0.117", features = ["derive"] }
+serde = { version = "1.0.118", features = ["derive"] }
-serde_json = { version = "1.0.59", features = ["preserve_order"] }
+serde_json = { version = "1.0.61", features = ["preserve_order"] }
 zerocopy = "0.3.0"

meilisearch-tokenizer/Cargo.toml

@@ -6,5 +6,5 @@ authors = ["Kerollmops <renault.cle@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-deunicode = "1.1.0"
+deunicode = "1.1.1"
 slice-group-by = "0.2.6"

meilisearch-types/Cargo.toml

@@ -10,7 +10,7 @@ version = "0.3.0"
 optional = true
 
 [dependencies.serde]
-version = "1.0.117"
+version = "1.0.118"
 features = ["derive"]
 optional = true