last review edits + fmt

meilisearch-http/src/index/mod.rs

@@ -59,19 +59,17 @@ impl Index {
         })
     }
 
-    pub fn retrieve_documents<S>(
+    pub fn retrieve_documents<S: AsRef<str>>(
         &self,
         offset: usize,
         limit: usize,
         attributes_to_retrieve: Option<Vec<S>>,
-    ) -> anyhow::Result<Vec<Map<String, Value>>>
-    where
-        S: AsRef<str> + Send + Sync + 'static,
-    {
+    ) -> anyhow::Result<Vec<Map<String, Value>>> {
         let txn = self.read_txn()?;
 
         let fields_ids_map = self.fields_ids_map(&txn)?;
-        let fields_to_display = self.fields_to_display(&txn, attributes_to_retrieve, &fields_ids_map)?;
+        let fields_to_display =
+            self.fields_to_display(&txn, attributes_to_retrieve, &fields_ids_map)?;
 
         let iter = self.documents.range(&txn, &(..))?.skip(offset).take(limit);
 
@@ -95,7 +93,8 @@ impl Index {
 
         let fields_ids_map = self.fields_ids_map(&txn)?;
 
-        let fields_to_display = self.fields_to_display(&txn, attributes_to_retrieve, &fields_ids_map)?;
+        let fields_to_display =
+            self.fields_to_display(&txn, attributes_to_retrieve, &fields_ids_map)?;
 
         let internal_id = self
             .external_documents_ids(&txn)?
@@ -109,11 +108,7 @@ impl Index {
             .map(|(_, d)| d);
 
         match document {
-            Some(document) => Ok(obkv_to_json(
-                &fields_to_display,
-                &fields_ids_map,
-                document,
-            )?),
+            Some(document) => Ok(obkv_to_json(&fields_to_display, &fields_ids_map, document)?),
             None => bail!("Document with id {} not found", doc_id),
         }
     }

meilisearch-http/src/index/search.rs

@@ -1,14 +1,14 @@
-use std::time::Instant;
-use std::collections::{HashSet, BTreeMap};
+use std::collections::{BTreeMap, HashSet};
 use std::mem;
+use std::time::Instant;
 
-use either::Either;
 use anyhow::bail;
+use either::Either;
 use heed::RoTxn;
 use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
-use milli::{FacetCondition, MatchingWords, facet::FacetValue};
-use serde::{Serialize, Deserialize};
-use serde_json::{Value, Map};
+use milli::{facet::FacetValue, FacetCondition, MatchingWords};
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
 
 use super::Index;
 
@@ -78,13 +78,15 @@ impl Index {
         let mut documents = Vec::new();
         let fields_ids_map = self.fields_ids_map(&rtxn).unwrap();
 
-        let fields_to_display = self.fields_to_display(&rtxn, query.attributes_to_retrieve, &fields_ids_map)?;
+        let fields_to_display =
+            self.fields_to_display(&rtxn, query.attributes_to_retrieve, &fields_ids_map)?;
 
         let stop_words = fst::Set::default();
         let highlighter = Highlighter::new(&stop_words);
 
         for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
-            let mut object = milli::obkv_to_json(&fields_to_display, &fields_ids_map, obkv).unwrap();
+            let mut object =
+                milli::obkv_to_json(&fields_to_display, &fields_ids_map, obkv).unwrap();
             if let Some(ref attributes_to_highlight) = query.attributes_to_highlight {
                 highlighter.highlight_record(&mut object, &matching_words, attributes_to_highlight);
             }
@@ -183,15 +185,15 @@ impl<'a, A: AsRef<[u8]>> Highlighter<'a, A> {
             }
             Value::Array(values) => Value::Array(
                 values
-                .into_iter()
-                .map(|v| self.highlight_value(v, words_to_highlight))
-                .collect(),
+                    .into_iter()
+                    .map(|v| self.highlight_value(v, words_to_highlight))
+                    .collect(),
             ),
             Value::Object(object) => Value::Object(
                 object
-                .into_iter()
-                .map(|(k, v)| (k, self.highlight_value(v, words_to_highlight)))
-                .collect(),
+                    .into_iter()
+                    .map(|(k, v)| (k, self.highlight_value(v, words_to_highlight)))
+                    .collect(),
             ),
         }
     }
@@ -221,9 +223,6 @@ fn parse_facets(
         // Disabled for now
         //Value::String(expr) => Ok(Some(FacetCondition::from_str(txn, index, expr)?)),
         Value::Array(arr) => parse_facets_array(txn, index, arr),
-        v => bail!(
-            "Invalid facet expression, expected Array, found: {:?}",
-            v
-        ),
+        v => bail!("Invalid facet expression, expected Array, found: {:?}", v),
     }
 }

meilisearch-http/src/index/updates.rs

@@ -4,8 +4,8 @@ use std::num::NonZeroUsize;
 
 use flate2::read::GzDecoder;
 use log::info;
-use milli::update::{UpdateFormat, IndexDocumentsMethod, UpdateBuilder, DocumentAdditionResult};
-use serde::{Serialize, Deserialize, de::Deserializer};
+use milli::update::{DocumentAdditionResult, IndexDocumentsMethod, UpdateBuilder, UpdateFormat};
+use serde::{de::Deserializer, Deserialize, Serialize};
 
 use super::Index;
 
@@ -23,14 +23,14 @@ pub struct Settings {
     #[serde(
         default,
         deserialize_with = "deserialize_some",
-        skip_serializing_if = "Option::is_none",
+        skip_serializing_if = "Option::is_none"
     )]
     pub displayed_attributes: Option<Option<Vec<String>>>,
 
     #[serde(
         default,
         deserialize_with = "deserialize_some",
-        skip_serializing_if = "Option::is_none",
+        skip_serializing_if = "Option::is_none"
     )]
     pub searchable_attributes: Option<Option<Vec<String>>>,
 
@@ -40,7 +40,7 @@ pub struct Settings {
     #[serde(
         default,
         deserialize_with = "deserialize_some",
-        skip_serializing_if = "Option::is_none",
+        skip_serializing_if = "Option::is_none"
     )]
     pub ranking_rules: Option<Option<Vec<String>>>,
 }
@@ -65,8 +65,9 @@ pub struct Facets {
 }
 
 fn deserialize_some<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
-where T: Deserialize<'de>,
-      D: Deserializer<'de>
+where
+    T: Deserialize<'de>,
+    D: Deserializer<'de>,
 {
     Deserialize::deserialize(deserializer).map(Some)
 }
@@ -85,7 +86,7 @@ impl Index {
         let mut wtxn = self.write_txn()?;
 
         // Set the primary key if not set already, ignore if already set.
-        if let (None, Some(ref primary_key)) =  (self.primary_key(&wtxn)?, primary_key) {
+        if let (None, Some(ref primary_key)) = (self.primary_key(&wtxn)?, primary_key) {
             self.put_primary_key(&mut wtxn, primary_key)?;
         }
 
@@ -106,10 +107,11 @@ impl Index {
 
         info!("document addition done: {:?}", result);
 
-        result.and_then(|addition_result| wtxn
-            .commit()
-            .and(Ok(UpdateResult::DocumentsAddition(addition_result)))
-            .map_err(Into::into))
+        result.and_then(|addition_result| {
+            wtxn.commit()
+                .and(Ok(UpdateResult::DocumentsAddition(addition_result)))
+                .map_err(Into::into)
+        })
     }
 
     pub fn clear_documents(&self, update_builder: UpdateBuilder) -> anyhow::Result<UpdateResult> {
@@ -210,14 +212,16 @@ impl Index {
         let mut builder = update_builder.delete_documents(&mut txn, self)?;
 
         // We ignore unexisting document ids
-        ids.iter().for_each(|id| { builder.delete_external_id(id); });
+        ids.iter().for_each(|id| {
+            builder.delete_external_id(id);
+        });
 
         match builder.execute() {
             Ok(deleted) => txn
                 .commit()
                 .and(Ok(UpdateResult::DocumentDeletion { deleted }))
                 .map_err(Into::into),
-            Err(e) => Err(e)
+            Err(e) => Err(e),
         }
     }
 }