diff --git a/crates/filter-parser/src/condition.rs b/crates/filter-parser/src/condition.rs index 6e9c24ba5..592e6b649 100644 --- a/crates/filter-parser/src/condition.rs +++ b/crates/filter-parser/src/condition.rs @@ -7,23 +7,14 @@ use nom::branch::alt; use nom::bytes::complete::tag; -use nom::character::complete::char; -use nom::character::complete::multispace0; -use nom::character::complete::multispace1; -use nom::combinator::cut; -use nom::combinator::map; -use nom::combinator::value; -use nom::sequence::preceded; -use nom::sequence::{terminated, tuple}; +use nom::character::complete::{char, multispace0, multispace1}; +use nom::combinator::{cut, map, value}; +use nom::sequence::{preceded, terminated, tuple}; use Condition::*; use crate::error::IResultExt; -use crate::value::parse_vector_value; -use crate::value::parse_vector_value_cut; -use crate::Error; -use crate::ErrorKind; -use crate::VectorFilter; -use crate::{parse_value, FilterCondition, IResult, Span, Token}; +use crate::value::{parse_vector_value, parse_vector_value_cut}; +use crate::{parse_value, Error, ErrorKind, FilterCondition, IResult, Span, Token, VectorFilter}; #[derive(Debug, Clone, PartialEq, Eq)] pub enum Condition<'a> { diff --git a/crates/meili-snap/src/lib.rs b/crates/meili-snap/src/lib.rs index efe57f8df..fb33fbe2f 100644 --- a/crates/meili-snap/src/lib.rs +++ b/crates/meili-snap/src/lib.rs @@ -271,9 +271,10 @@ macro_rules! json_string { #[cfg(test)] mod tests { + use uuid::Uuid; + use crate as meili_snap; use crate::UUID_IN_MESSAGE_RE; - use uuid::Uuid; #[test] fn snap() { diff --git a/crates/meilisearch/src/routes/webhooks.rs b/crates/meilisearch/src/routes/webhooks.rs index b25b19336..7412595b5 100644 --- a/crates/meilisearch/src/routes/webhooks.rs +++ b/crates/meilisearch/src/routes/webhooks.rs @@ -1,3 +1,4 @@ +use core::convert::Infallible; use std::collections::BTreeMap; use std::str::FromStr; @@ -7,7 +8,6 @@ use actix_http::header::{ }; use actix_web::web::{self, Data, Path}; use actix_web::{HttpRequest, HttpResponse}; -use core::convert::Infallible; use deserr::actix_web::AwebJson; use deserr::{DeserializeError, Deserr, ValuePointerRef}; use index_scheduler::IndexScheduler; @@ -24,12 +24,12 @@ use tracing::debug; use url::Url; use utoipa::{OpenApi, ToSchema}; use uuid::Uuid; +use WebhooksError::*; use crate::analytics::{Aggregate, Analytics}; use crate::extractors::authentication::policies::ActionPolicy; use crate::extractors::authentication::GuardedData; use crate::extractors::sequential_extractor::SeqHandler; -use WebhooksError::*; #[derive(OpenApi)] #[openapi( diff --git a/crates/meilisearch/tests/documents/add_documents.rs b/crates/meilisearch/tests/documents/add_documents.rs index 5f66c107d..78e756059 100644 --- a/crates/meilisearch/tests/documents/add_documents.rs +++ b/crates/meilisearch/tests/documents/add_documents.rs @@ -1,6 +1,3 @@ -use crate::common::encoder::Encoder; -use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value}; -use crate::json; use actix_web::test; use meili_snap::{json_string, snapshot}; use meilisearch::Opt; @@ -8,6 +5,10 @@ use time::format_description::well_known::Rfc3339; use time::OffsetDateTime; use uuid::Uuid; +use crate::common::encoder::Encoder; +use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value}; +use crate::json; + /// This is the basic usage of our API and every other tests uses the content-type application/json #[actix_rt::test] async fn add_documents_test_json_content_types() { diff --git a/crates/meilisearch/tests/documents/geojson/mod.rs b/crates/meilisearch/tests/documents/geojson/mod.rs index 91b5994b1..334076222 100644 --- a/crates/meilisearch/tests/documents/geojson/mod.rs +++ b/crates/meilisearch/tests/documents/geojson/mod.rs @@ -1,9 +1,8 @@ -use crate::{ - common::{shared_index_geojson_documents, Server}, - json, -}; use meili_snap::{json_string, snapshot}; +use crate::common::{shared_index_geojson_documents, Server}; +use crate::json; + const LILLE: &str = include_str!("assets/lille.geojson"); #[actix_rt::test] diff --git a/crates/meilisearch/tests/index/update_index.rs b/crates/meilisearch/tests/index/update_index.rs index 5b72d4328..1bfca7659 100644 --- a/crates/meilisearch/tests/index/update_index.rs +++ b/crates/meilisearch/tests/index/update_index.rs @@ -1,5 +1,4 @@ use meili_snap::snapshot; - use time::format_description::well_known::Rfc3339; use time::OffsetDateTime; diff --git a/crates/meilisearch/tests/search/multi/proxy.rs b/crates/meilisearch/tests/search/multi/proxy.rs index c435a491e..cee73a806 100644 --- a/crates/meilisearch/tests/search/multi/proxy.rs +++ b/crates/meilisearch/tests/search/multi/proxy.rs @@ -2,8 +2,7 @@ use std::sync::Arc; use actix_http::StatusCode; use meili_snap::{json_string, snapshot}; -use wiremock::matchers::method; -use wiremock::matchers::{path, AnyMatcher}; +use wiremock::matchers::{method, path, AnyMatcher}; use wiremock::{Mock, MockServer, Request, ResponseTemplate}; use crate::common::{Server, Value, SCORE_DOCUMENTS}; diff --git a/crates/meilisearch/tests/search/pagination.rs b/crates/meilisearch/tests/search/pagination.rs index 6dd8b3181..853fa545e 100644 --- a/crates/meilisearch/tests/search/pagination.rs +++ b/crates/meilisearch/tests/search/pagination.rs @@ -1,7 +1,8 @@ +use meili_snap::{json_string, snapshot}; + use super::shared_index_with_documents; use crate::common::Server; use crate::json; -use meili_snap::{json_string, snapshot}; #[actix_rt::test] async fn default_search_should_return_estimated_total_hit() { diff --git a/crates/meilisearch/tests/settings/chat.rs b/crates/meilisearch/tests/settings/chat.rs index 891a22431..2c2ed25f6 100644 --- a/crates/meilisearch/tests/settings/chat.rs +++ b/crates/meilisearch/tests/settings/chat.rs @@ -1,6 +1,7 @@ +use meili_snap::{json_string, snapshot}; + use crate::common::Server; use crate::json; -use meili_snap::{json_string, snapshot}; #[actix_rt::test] async fn set_reset_chat_issue_5772() { diff --git a/crates/milli/src/update/new/indexer/extract.rs b/crates/milli/src/update/new/indexer/extract.rs index 971aaf095..b7cf2f5fd 100644 --- a/crates/milli/src/update/new/indexer/extract.rs +++ b/crates/milli/src/update/new/indexer/extract.rs @@ -19,8 +19,7 @@ use crate::proximity::ProximityPrecision; use crate::update::new::extract::cellulite::GeoJsonExtractor; use crate::update::new::extract::EmbeddingExtractor; use crate::update::new::indexer::settings_changes::DocumentsIndentifiers; -use crate::update::new::merger::merge_and_send_cellulite; -use crate::update::new::merger::merge_and_send_rtree; +use crate::update::new::merger::{merge_and_send_cellulite, merge_and_send_rtree}; use crate::update::new::{merge_and_send_docids, merge_and_send_facet_docids, FacetDatabases}; use crate::update::settings::SettingsDelta; use crate::vector::db::{EmbedderInfo, IndexEmbeddingConfig};