Cargo fmt

crates/benchmarks/benches/search_geo.rs

@@ -2,7 +2,8 @@ mod datasets_paths;
 mod utils;
 
 use criterion::{criterion_group, criterion_main};
-use milli::{update::Settings, FilterableAttributesRule};
+use milli::update::Settings;
+use milli::FilterableAttributesRule;
 use utils::Conf;
 
 #[cfg(not(windows))]

crates/benchmarks/benches/search_songs.rs

@@ -2,7 +2,8 @@ mod datasets_paths;
 mod utils;
 
 use criterion::{criterion_group, criterion_main};
-use milli::{update::Settings, FilterableAttributesRule};
+use milli::update::Settings;
+use milli::FilterableAttributesRule;
 use utils::Conf;
 
 #[cfg(not(windows))]

crates/index-scheduler/src/scheduler/mod.rs

@@ -375,9 +375,11 @@ impl IndexScheduler {
                 post_commit_dabases_sizes
                     .get(dbname)
                     .map(|post_size| {
-                        use byte_unit::{Byte, UnitType::Binary};
                         use std::cmp::Ordering::{Equal, Greater, Less};
 
+                        use byte_unit::Byte;
+                        use byte_unit::UnitType::Binary;
+
                         let post = Byte::from_u64(*post_size as u64).get_appropriate_unit(Binary);
                         let diff_size = post_size.abs_diff(*pre_size) as u64;
                         let diff = Byte::from_u64(diff_size).get_appropriate_unit(Binary);

crates/index-scheduler/src/scheduler/test_failure.rs

@@ -2,10 +2,9 @@ use std::time::Instant;
 
 use big_s::S;
 use meili_snap::snapshot;
-use meilisearch_types::milli::obkv_to_json;
 use meilisearch_types::milli::update::IndexDocumentsMethod::*;
 use meilisearch_types::milli::update::Setting;
-use meilisearch_types::milli::FilterableAttributesRule;
+use meilisearch_types::milli::{obkv_to_json, FilterableAttributesRule};
 use meilisearch_types::tasks::{Kind, KindWithContent};
 
 use crate::insta_snapshot::snapshot_index_scheduler;

crates/meilisearch/tests/index/get_index.rs

@@ -1,8 +1,8 @@
-use crate::json;
 use meili_snap::{json_string, snapshot};
 use serde_json::Value;
 
 use crate::common::{shared_does_not_exists_index, Server};
+use crate::json;
 
 #[actix_rt::test]
 async fn create_and_get_index() {

crates/meilisearch/tests/search/errors.rs

@@ -1,10 +1,9 @@
 use meili_snap::*;
 
+use super::test_settings_documents_indexing_swapping_and_search;
 use crate::common::{shared_does_not_exists_index, Server, DOCUMENTS, NESTED_DOCUMENTS};
 use crate::json;
 
-use super::test_settings_documents_indexing_swapping_and_search;
-
 #[actix_rt::test]
 async fn search_unexisting_index() {
     let index = shared_does_not_exists_index().await;

crates/meilisearch/tests/search/filters.rs

@@ -3,10 +3,10 @@ use meilisearch::Opt;
 use tempfile::TempDir;
 
 use super::test_settings_documents_indexing_swapping_and_search;
-use crate::{
+use crate::common::{
-    common::{default_settings, shared_index_with_documents, Server, DOCUMENTS, NESTED_DOCUMENTS},
+    default_settings, shared_index_with_documents, Server, DOCUMENTS, NESTED_DOCUMENTS,
-    json,
 };
+use crate::json;
 
 #[actix_rt::test]
 async fn search_with_filter_string_notation() {

crates/meilisearch/tests/search/geo.rs

@@ -2,11 +2,10 @@ use meili_snap::{json_string, snapshot};
 use meilisearch_types::milli::constants::RESERVED_GEO_FIELD_NAME;
 use once_cell::sync::Lazy;
 
+use super::test_settings_documents_indexing_swapping_and_search;
 use crate::common::{Server, Value};
 use crate::json;
 
-use super::test_settings_documents_indexing_swapping_and_search;
-
 static DOCUMENTS: Lazy<Value> = Lazy::new(|| {
     json!([
         {

crates/milli/src/database_stats.rs

@@ -1,9 +1,6 @@
 use std::mem;
 
-use heed::Database;
+use heed::{Database, DatabaseStat, RoTxn, Unspecified};
-use heed::DatabaseStat;
-use heed::RoTxn;
-use heed::Unspecified;
 use serde::{Deserialize, Serialize};
 
 use crate::BEU32;

crates/milli/src/disabled_typos_terms.rs

@@ -1,10 +1,9 @@
-use heed::{
+use heed::types::{SerdeJson, Str};
-    types::{SerdeJson, Str},
+use heed::{RoTxn, RwTxn};
-    RoTxn, RwTxn,
-};
 use serde::{Deserialize, Serialize};
 
-use crate::{index::main_key, Index};
+use crate::index::main_key;
+use crate::Index;
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]

crates/milli/src/error.rs

@@ -1,5 +1,4 @@
-use std::collections::BTreeSet;
+use std::collections::{BTreeSet, HashMap};
-use std::collections::HashMap;
 use std::convert::Infallible;
 use std::fmt::Write;
 use std::{io, str};

crates/milli/src/filterable_attributes_rules.rs

@@ -1,13 +1,12 @@
+use std::collections::{BTreeSet, HashSet};
+
 use deserr::{DeserializeError, Deserr, ValuePointerRef};
 use serde::{Deserialize, Serialize};
-use std::collections::{BTreeSet, HashSet};
 use utoipa::ToSchema;
 
-use crate::{
+use crate::attribute_patterns::{match_distinct_field, match_field_legacy, PatternMatch};
-    attribute_patterns::{match_distinct_field, match_field_legacy, PatternMatch},
+use crate::constants::RESERVED_GEO_FIELD_NAME;
-    constants::RESERVED_GEO_FIELD_NAME,
+use crate::AttributePatterns;
-    AttributePatterns,
-};
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug, ToSchema)]
 #[serde(untagged)]

crates/milli/src/progress.rs

@@ -1,4 +1,3 @@
-use enum_iterator::Sequence;
 use std::any::TypeId;
 use std::borrow::Cow;
 use std::marker::PhantomData;
@@ -6,6 +5,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{Arc, RwLock};
 use std::time::{Duration, Instant};
 
+use enum_iterator::Sequence;
 use indexmap::IndexMap;
 use itertools::Itertools;
 use serde::Serialize;

crates/milli/src/search/new/geo_sort.rs

@@ -1,8 +1,9 @@
+use std::collections::VecDeque;
+
 use heed::types::{Bytes, Unit};
 use heed::{RoPrefix, RoTxn};
 use roaring::RoaringBitmap;
 use rstar::RTree;
-use std::collections::VecDeque;
 
 use super::facet_string_values;
 use super::ranking_rules::{RankingRule, RankingRuleOutput, RankingRuleQueryTrait};

crates/milli/src/search/new/mod.rs

@@ -47,8 +47,7 @@ use sort::Sort;
 
 use self::distinct::facet_string_values;
 use self::geo_sort::GeoSort;
-pub use self::geo_sort::Parameter as GeoSortParameter;
+pub use self::geo_sort::{Parameter as GeoSortParameter, Strategy as GeoSortStrategy};
-pub use self::geo_sort::Strategy as GeoSortStrategy;
 use self::graph_based_ranking_rule::Words;
 use self::interner::Interned;
 use self::vector_sort::VectorSort;

crates/milli/src/update/new/extract/faceted/facet_document.rs

@@ -4,6 +4,7 @@ use serde_json::Value;
 
 use crate::attribute_patterns::PatternMatch;
 use crate::fields_ids_map::metadata::Metadata;
+use crate::filterable_attributes_rules::match_faceted_field;
 use crate::update::new::document::Document;
 use crate::update::new::extract::geo::extract_geo_coordinates;
 use crate::update::new::extract::perm_json_p;
@@ -11,8 +12,6 @@ use crate::{
     FieldId, FilterableAttributesRule, GlobalFieldsIdsMap, InternalError, Result, UserError,
 };
 
-use crate::filterable_attributes_rules::match_faceted_field;
-
 #[allow(clippy::too_many_arguments)]
 pub fn extract_document_facets<'doc>(
     document: impl Document<'doc>,

crates/milli/src/update/new/extract/mod.rs

@@ -18,7 +18,8 @@ pub use vectors::EmbeddingExtractor;
 pub mod perm_json_p {
     use serde_json::{Map, Value};
 
-    use crate::{attribute_patterns::PatternMatch, Result};
+    use crate::attribute_patterns::PatternMatch;
+    use crate::Result;
     const SPLIT_SYMBOL: char = '.';
 
     /// Returns `true` if the `selector` match the `key`.

crates/milli/src/update/settings.rs

@@ -23,8 +23,8 @@ use crate::error::UserError;
 use crate::fields_ids_map::metadata::{FieldIdMapWithMetadata, MetadataBuilder};
 use crate::filterable_attributes_rules::match_faceted_field;
 use crate::index::{
-    ChatConfig, IndexEmbeddingConfig, PrefixSearch,
+    ChatConfig, IndexEmbeddingConfig, PrefixSearch, SearchParameters,
-    SearchParameters, DEFAULT_MIN_WORD_LEN_ONE_TYPO, DEFAULT_MIN_WORD_LEN_TWO_TYPOS,
+    DEFAULT_MIN_WORD_LEN_ONE_TYPO, DEFAULT_MIN_WORD_LEN_TWO_TYPOS,
 };
 use crate::order_by_map::OrderByMap;
 use crate::prompt::{default_max_bytes, default_template_text, PromptData};
@@ -1325,9 +1325,7 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> {
                                 Setting::NotSet => search_parameters.distinct.clone(),
                             },
                             matching_strategy: match matching_strategy {
-                                Setting::Set(matching_strategy) => {
+                                Setting::Set(matching_strategy) => Some(*matching_strategy),
-                                    Some(*matching_strategy)
-                                }
                                 Setting::Reset => None,
                                 Setting::NotSet => search_parameters.matching_strategy,
                             },