From 45f843ccb9c0c09010d94c6b9720418fd3883a50 Mon Sep 17 00:00:00 2001 From: Tamo Date: Mon, 10 Feb 2025 10:46:42 +0100 Subject: [PATCH] fmt --- .../index-scheduler/src/scheduler/test_failure.rs | 3 +-- crates/index-scheduler/src/versioning.rs | 13 +++++++------ crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs | 1 - crates/milli/src/update/new/indexer/mod.rs | 3 +-- crates/milli/src/update/upgrade/v1_12.rs | 3 +-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/crates/index-scheduler/src/scheduler/test_failure.rs b/crates/index-scheduler/src/scheduler/test_failure.rs index 712fe01a5..5cdcb248b 100644 --- a/crates/index-scheduler/src/scheduler/test_failure.rs +++ b/crates/index-scheduler/src/scheduler/test_failure.rs @@ -6,8 +6,7 @@ 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::tasks::Kind; -use meilisearch_types::tasks::KindWithContent; +use meilisearch_types::tasks::{Kind, KindWithContent}; use crate::insta_snapshot::snapshot_index_scheduler; use crate::test_utils::Breakpoint::*; diff --git a/crates/index-scheduler/src/versioning.rs b/crates/index-scheduler/src/versioning.rs index aaf5224ff..22132bf5f 100644 --- a/crates/index-scheduler/src/versioning.rs +++ b/crates/index-scheduler/src/versioning.rs @@ -1,9 +1,10 @@ -use crate::{upgrade::upgrade_index_scheduler, Result}; -use meilisearch_types::{ - heed::{self, types::Str, Database, Env, RoTxn, RwTxn}, - milli::heed_codec::version::VersionCodec, - versioning, -}; +use meilisearch_types::heed::types::Str; +use meilisearch_types::heed::{self, Database, Env, RoTxn, RwTxn}; +use meilisearch_types::milli::heed_codec::version::VersionCodec; +use meilisearch_types::versioning; + +use crate::upgrade::upgrade_index_scheduler; +use crate::Result; /// The number of database used by queue itself const NUMBER_OF_DATABASES: u32 = 1; diff --git a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs index 50bd79e00..1d364d855 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs +++ b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs @@ -268,4 +268,3 @@ async fn check_the_index_features(server: &Server) { kefir.search_post(json!({ "sort": ["age:asc"], "filter": "surname = kefirounet" })).await; snapshot!(results, name: "search_with_sort_and_filter"); } - diff --git a/crates/milli/src/update/new/indexer/mod.rs b/crates/milli/src/update/new/indexer/mod.rs index 8b98bfba3..f3c96e6e5 100644 --- a/crates/milli/src/update/new/indexer/mod.rs +++ b/crates/milli/src/update/new/indexer/mod.rs @@ -1,5 +1,5 @@ use std::sync::atomic::AtomicBool; -use std::sync::RwLock; +use std::sync::{Once, RwLock}; use std::thread::{self, Builder}; use big_s::S; @@ -21,7 +21,6 @@ use crate::progress::Progress; use crate::update::GrenadParameters; use crate::vector::{ArroyWrapper, EmbeddingConfigs}; use crate::{FieldsIdsMap, GlobalFieldsIdsMap, Index, InternalError, Result, ThreadPoolNoAbort}; -use std::sync::Once; pub(crate) mod de; pub mod document_changes; diff --git a/crates/milli/src/update/upgrade/v1_12.rs b/crates/milli/src/update/upgrade/v1_12.rs index e48ecfe36..9086e920f 100644 --- a/crates/milli/src/update/upgrade/v1_12.rs +++ b/crates/milli/src/update/upgrade/v1_12.rs @@ -1,11 +1,10 @@ use heed::RwTxn; +use super::UpgradeIndex; use crate::constants::{VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH}; use crate::progress::Progress; use crate::{make_enum_progress, Index, Result}; -use super::UpgradeIndex; - #[allow(non_camel_case_types)] pub(super) struct V1_12_To_V1_12_3 {}