bump edition to 2024 (#5750)

* upgrade rustc to 1.86

* upgrade to edition 2024

* rustfmt

Author: trinity-1686a

quickwit/Cargo.toml

@@ -71,7 +71,7 @@ default-members = [
 
 [workspace.package]
 version = "0.8.0"
-edition = "2021"
+edition = "2024"
 homepage = "https://quickwit.io/"
 documentation = "https://quickwit.io/docs/"
 repository = "https://github.com/quickwit-oss/quickwit"

quickwit/quickwit-actors/benches/bench.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use async_trait::async_trait;
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler, Universe};
 
 #[derive(Default)]

quickwit/quickwit-actors/src/actor_context.rs

@@ -16,20 +16,20 @@ use std::convert::Infallible;
 use std::fmt;
 use std::future::Future;
 use std::ops::Deref;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 
 use quickwit_common::metrics::IntCounter;
 use quickwit_common::{KillSwitch, Progress, ProtectedZoneGuard};
 use tokio::sync::{oneshot, watch};
 use tracing::{debug, error};
 
+#[cfg(any(test, feature = "testsuite"))]
+use crate::Universe;
 use crate::actor_state::AtomicState;
 use crate::registry::ActorRegistry;
 use crate::spawn_builder::{SpawnBuilder, SpawnContext};
-#[cfg(any(test, feature = "testsuite"))]
-use crate::Universe;
 use crate::{
     Actor, ActorExitStatus, ActorState, AskError, Command, DeferableReplyHandler, Mailbox,
     SendError, TrySendError,

quickwit/quickwit-actors/src/channel_with_priority.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
+use std::sync::atomic::{AtomicBool, Ordering};
 
 use flume::TryRecvError;
 use thiserror::Error;

quickwit/quickwit-actors/src/envelope.rs

@@ -29,7 +29,6 @@ use crate::{Actor, ActorContext, ActorExitStatus};
 /// queue with a single type.
 /// Before appending, we capture the right handler implementation
 /// in the form of a `Box<dyn Envelope>`, and append that to the queue.
-
 pub struct Envelope<A> {
     handler_envelope: Box<dyn EnvelopeT<A>>,
     _no_advance_time_guard: Option<NoAdvanceTimeGuard>,

quickwit/quickwit-actors/src/lib.rs

@@ -42,7 +42,7 @@ pub(crate) mod scheduler;
 mod spawn_builder;
 mod supervisor;
 
-pub use scheduler::{start_scheduler, SchedulerClient};
+pub use scheduler::{SchedulerClient, start_scheduler};
 
 #[cfg(test)]
 pub(crate) mod tests;

quickwit/quickwit-actors/src/mailbox.rs

@@ -23,7 +23,7 @@ use quickwit_common::metrics::{GaugeGuard, IntCounter, IntGauge};
 use tokio::sync::oneshot;
 
 use crate::channel_with_priority::{Receiver, Sender, TrySendError};
-use crate::envelope::{wrap_in_envelope, Envelope};
+use crate::envelope::{Envelope, wrap_in_envelope};
 use crate::scheduler::SchedulerClient;
 use crate::{Actor, AskError, Command, DeferableReplyHandler, QueueCapacity, RecvError, SendError};
 

quickwit/quickwit-actors/src/registry.rs

@@ -256,8 +256,8 @@ impl ActorJoinHandle {
 mod tests {
     use std::time::Duration;
 
-    use crate::tests::PingReceiverActor;
     use crate::Universe;
+    use crate::tests::PingReceiverActor;
 
     #[tokio::test]
     async fn test_registry() {

quickwit/quickwit-actors/src/scheduler.rs

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 use std::cmp::Reverse;
-use std::collections::binary_heap::PeekMut;
 use std::collections::BinaryHeap;
+use std::collections::binary_heap::PeekMut;
 use std::future::Future;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{Arc, Weak};
@@ -361,8 +361,8 @@ impl Scheduler {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::atomic::{AtomicUsize, Ordering};
     use std::sync::Arc;
+    use std::sync::atomic::{AtomicUsize, Ordering};
     use std::time::{Duration, Instant};
 
     use async_trait::async_trait;

quickwit/quickwit-actors/src/spawn_builder.rs

@@ -21,7 +21,7 @@ use tokio::sync::watch;
 use tracing::{debug, error, info};
 
 use crate::envelope::Envelope;
-use crate::mailbox::{create_mailbox, Inbox};
+use crate::mailbox::{Inbox, create_mailbox};
 use crate::registry::{ActorJoinHandle, ActorRegistry};
 use crate::scheduler::{NoAdvanceTimeGuard, SchedulerClient};
 use crate::supervisor::Supervisor;

quickwit/quickwit-actors/src/tests.rs

@@ -155,10 +155,12 @@ async fn test_ping_actor() {
     // No peers. This one will have no impact.
     let ping_recv_mailbox = ping_recv_mailbox.clone();
     assert!(ping_sender_mailbox.send_message(Ping).await.is_ok());
-    assert!(ping_sender_mailbox
-        .send_message(AddPeer(ping_recv_mailbox.clone()))
-        .await
-        .is_ok());
+    assert!(
+        ping_sender_mailbox
+            .send_message(AddPeer(ping_recv_mailbox.clone()))
+            .await
+            .is_ok()
+    );
     assert_eq!(
         ping_sender_handle.process_pending_and_observe().await,
         Observation {
@@ -292,16 +294,20 @@ async fn test_pause_actor() {
     for _ in 0u32..1000u32 {
         assert!(ping_mailbox.send_message(Ping).await.is_ok());
     }
-    assert!(ping_mailbox
-        .send_message_with_high_priority(Command::Pause)
-        .is_ok());
+    assert!(
+        ping_mailbox
+            .send_message_with_high_priority(Command::Pause)
+            .is_ok()
+    );
     let first_state = ping_handle.observe().await.state;
     assert!(first_state < 1000);
     let second_state = ping_handle.observe().await.state;
     assert_eq!(first_state, second_state);
-    assert!(ping_mailbox
-        .send_message_with_high_priority(Command::Resume)
-        .is_ok());
+    assert!(
+        ping_mailbox
+            .send_message_with_high_priority(Command::Resume)
+            .is_ok()
+    );
     let end_state = ping_handle.process_pending_and_observe().await.state;
     assert_eq!(end_state, 1000);
     universe.assert_quit().await;

quickwit/quickwit-actors/src/universe.rs

@@ -136,11 +136,13 @@ impl Universe {
     /// This is useful for testing purposes to detect failed asserts in actors.
     #[cfg(any(test, feature = "testsuite"))]
     pub async fn assert_quit(self) {
-        assert!(!self
-            .quit()
-            .await
-            .values()
-            .any(|status| matches!(status, ActorExitStatus::Panicked)));
+        assert!(
+            !self
+                .quit()
+                .await
+                .values()
+                .any(|status| matches!(status, ActorExitStatus::Panicked))
+        );
     }
 }
 
@@ -253,11 +255,13 @@ mod tests {
         let actor_with_schedule = CountingMinutesActor::default();
         let (_mailbox, handler) = universe.spawn_builder().spawn(actor_with_schedule);
         assert!(matches!(handler.quit().await, (ActorExitStatus::Quit, 1)));
-        assert!(!universe
-            .quit()
-            .await
-            .values()
-            .any(|status| matches!(status, ActorExitStatus::Panicked)));
+        assert!(
+            !universe
+                .quit()
+                .await
+                .values()
+                .any(|status| matches!(status, ActorExitStatus::Panicked))
+        );
     }
 
     #[tokio::test]
@@ -267,11 +271,13 @@ mod tests {
         let actor_with_schedule = CountingMinutesActor::default();
         let (_mailbox, _handler) = universe.spawn_builder().spawn(panicking_actor);
         let (_mailbox, _handler) = universe.spawn_builder().spawn(actor_with_schedule);
-        assert!(universe
-            .quit()
-            .await
-            .values()
-            .any(|status| matches!(status, ActorExitStatus::Panicked)));
+        assert!(
+            universe
+                .quit()
+                .await
+                .values()
+                .any(|status| matches!(status, ActorExitStatus::Panicked))
+        );
     }
 
     #[tokio::test]

quickwit/quickwit-aws/src/error.rs

@@ -48,7 +48,7 @@ fn is_retryable(meta: &aws_sdk_s3::error::ErrorMetadata) -> bool {
         THROTTLING_ERRORS.contains(&code)
             || TRANSIENT_ERRORS.contains(&code)
             || code == "InternalError" // this is somehow not considered transient, despite the
-                                       // associated error message containing "Please try again."
+    // associated error message containing "Please try again."
     } else {
         false
     }

quickwit/quickwit-aws/src/lib.rs

@@ -14,14 +14,14 @@
 
 use std::time::Duration;
 
+use aws_config::BehaviorVersion;
 use aws_config::retry::RetryConfig;
 use aws_config::stalled_stream_protection::StalledStreamProtectionConfig;
-use aws_config::BehaviorVersion;
 pub use aws_smithy_async::rt::sleep::TokioSleep;
 use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
 use aws_types::region::Region;
-use hyper::client::HttpConnector;
 use hyper::Client as HyperClient;
+use hyper::client::HttpConnector;
 use hyper_rustls::HttpsConnectorBuilder;
 use tokio::sync::OnceCell;
 

quickwit/quickwit-aws/src/retry.rs

@@ -16,7 +16,7 @@ use std::fmt::Debug;
 
 use futures::{Future, TryFutureExt};
 use quickwit_common::retry::{
-    retry_with_mockable_sleep, Retry, RetryParams, Retryable, TokioSleep,
+    Retry, RetryParams, Retryable, TokioSleep, retry_with_mockable_sleep,
 };
 
 pub trait AwsRetryable {

quickwit/quickwit-cli/src/cli.rs

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use anyhow::{bail, Context};
-use clap::{arg, Arg, ArgAction, ArgMatches, Command};
+use anyhow::{Context, bail};
+use clap::{Arg, ArgAction, ArgMatches, Command, arg};
 use quickwit_serve::EnvFilterReloadFn;
 use tracing::Level;
 
-use crate::index::{build_index_command, IndexCliCommand};
-use crate::service::{build_run_command, RunCliCommand};
-use crate::source::{build_source_command, SourceCliCommand};
-use crate::split::{build_split_command, SplitCliCommand};
-use crate::tool::{build_tool_command, ToolCliCommand};
+use crate::index::{IndexCliCommand, build_index_command};
+use crate::service::{RunCliCommand, build_run_command};
+use crate::source::{SourceCliCommand, build_source_command};
+use crate::split::{SplitCliCommand, build_split_command};
+use crate::tool::{ToolCliCommand, build_tool_command};
 
 pub fn build_cli() -> Command {
     Command::new("Quickwit")

quickwit/quickwit-cli/src/index.rs

@@ -20,9 +20,9 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::{Duration, Instant};
 
-use anyhow::{anyhow, bail, Context};
+use anyhow::{Context, anyhow, bail};
 use bytesize::ByteSize;
-use clap::{arg, Arg, ArgAction, ArgMatches, Command};
+use clap::{Arg, ArgAction, ArgMatches, Command, arg};
 use colored::Colorize;
 use indicatif::{ProgressBar, ProgressStyle};
 use itertools::Itertools;
@@ -36,16 +36,16 @@ use quickwit_proto::types::IndexId;
 use quickwit_rest_client::models::{IngestSource, SearchResponseRestClient};
 use quickwit_rest_client::rest_client::{CommitType, IngestEvent};
 use quickwit_serve::{ListSplitsQueryParams, SearchRequestQueryString, SortBy};
-use quickwit_storage::{load_file, StorageResolver};
+use quickwit_storage::{StorageResolver, load_file};
 use tabled::settings::object::{FirstRow, Rows, Segment};
 use tabled::settings::panel::Footer;
 use tabled::settings::{Alignment, Disable, Format, Modify, Panel, Rotate, Style};
 use tabled::{Table, Tabled};
-use tracing::{debug, Level};
+use tracing::{Level, debug};
 
 use crate::checklist::{GREEN_COLOR, RED_COLOR};
 use crate::stats::{mean, percentile, std_deviation};
-use crate::{client_args, make_table, prompt_confirmation, ClientArgs};
+use crate::{ClientArgs, client_args, make_table, prompt_confirmation};
 
 pub fn build_index_command() -> Command {
     Command::new("index")

quickwit/quickwit-cli/src/lib.rs

@@ -18,22 +18,22 @@ use std::collections::HashSet;
 use std::str::FromStr;
 
 use anyhow::Context;
-use clap::{arg, Arg, ArgMatches};
-use dialoguer::theme::ColorfulTheme;
+use clap::{Arg, ArgMatches, arg};
 use dialoguer::Confirm;
+use dialoguer::theme::ColorfulTheme;
 use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::Uri;
 use quickwit_config::service::QuickwitService;
 use quickwit_config::{
-    ConfigFormat, MetastoreConfigs, NodeConfig, SourceConfig, StorageConfigs,
-    DEFAULT_QW_CONFIG_PATH,
+    ConfigFormat, DEFAULT_QW_CONFIG_PATH, MetastoreConfigs, NodeConfig, SourceConfig,
+    StorageConfigs,
 };
 use quickwit_indexing::check_source_connectivity;
 use quickwit_metastore::{IndexMetadataResponseExt, MetastoreResolver};
 use quickwit_proto::metastore::{IndexMetadataRequest, MetastoreService, MetastoreServiceClient};
 use quickwit_rest_client::models::Timeout;
-use quickwit_rest_client::rest_client::{QuickwitClient, QuickwitClientBuilder, DEFAULT_BASE_URL};
-use quickwit_storage::{load_file, StorageResolver};
+use quickwit_rest_client::rest_client::{DEFAULT_BASE_URL, QuickwitClient, QuickwitClientBuilder};
+use quickwit_storage::{StorageResolver, load_file};
 use reqwest::Url;
 use tabled::settings::object::Rows;
 use tabled::settings::panel::Header;

quickwit/quickwit-cli/src/logger.rs

@@ -17,24 +17,24 @@ use std::{env, fmt};
 
 use anyhow::Context;
 use opentelemetry::trace::TracerProvider;
-use opentelemetry::{global, KeyValue};
+use opentelemetry::{KeyValue, global};
 use opentelemetry_sdk::propagation::TraceContextPropagator;
 use opentelemetry_sdk::trace::BatchConfigBuilder;
-use opentelemetry_sdk::{trace, Resource};
+use opentelemetry_sdk::{Resource, trace};
 use quickwit_common::{get_bool_from_env, get_from_env_opt};
 use quickwit_serve::{BuildInfo, EnvFilterReloadFn};
 use time::format_description::BorrowedFormatItem;
 use tracing::{Event, Level, Subscriber};
+use tracing_subscriber::EnvFilter;
 use tracing_subscriber::field::RecordFields;
+use tracing_subscriber::fmt::FmtContext;
 use tracing_subscriber::fmt::format::{
     DefaultFields, Format, FormatEvent, FormatFields, Full, Json, JsonFields, Writer,
 };
 use tracing_subscriber::fmt::time::UtcTime;
-use tracing_subscriber::fmt::FmtContext;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::registry::LookupSpan;
-use tracing_subscriber::EnvFilter;
 
 use crate::QW_ENABLE_OPENTELEMETRY_OTLP_EXPORTER_ENV_KEY;
 #[cfg(feature = "tokio-console")]
@@ -183,7 +183,7 @@ enum FieldFormat {
     Json(JsonFields),
 }
 
-impl<'a> FormatFields<'a> for FieldFormat {
+impl FormatFields<'_> for FieldFormat {
     fn format_fields<R: RecordFields>(&self, writer: Writer<'_>, fields: R) -> fmt::Result {
         match self {
             FieldFormat::Default(default_fields) => default_fields.format_fields(writer, fields),