Skip to content

Commit c7d3314

Browse files
bump edition to 2024 (#5750)
* upgrade rustc to 1.86 * upgrade to edition 2024 * rustfmt
1 parent 7dabbe5 commit c7d3314

File tree

380 files changed

+2322
-1960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+2322
-1960
lines changed

quickwit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ default-members = [
7171

7272
[workspace.package]
7373
version = "0.8.0"
74-
edition = "2021"
74+
edition = "2024"
7575
homepage = "https://quickwit.io/"
7676
documentation = "https://quickwit.io/docs/"
7777
repository = "https://github.com/quickwit-oss/quickwit"

quickwit/quickwit-actors/benches/bench.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
use async_trait::async_trait;
16-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
16+
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
1717
use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler, Universe};
1818

1919
#[derive(Default)]

quickwit/quickwit-actors/src/actor_context.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ use std::convert::Infallible;
1616
use std::fmt;
1717
use std::future::Future;
1818
use std::ops::Deref;
19-
use std::sync::atomic::{AtomicBool, Ordering};
2019
use std::sync::Arc;
20+
use std::sync::atomic::{AtomicBool, Ordering};
2121
use std::time::Duration;
2222

2323
use quickwit_common::metrics::IntCounter;
2424
use quickwit_common::{KillSwitch, Progress, ProtectedZoneGuard};
2525
use tokio::sync::{oneshot, watch};
2626
use tracing::{debug, error};
2727

28+
#[cfg(any(test, feature = "testsuite"))]
29+
use crate::Universe;
2830
use crate::actor_state::AtomicState;
2931
use crate::registry::ActorRegistry;
3032
use crate::spawn_builder::{SpawnBuilder, SpawnContext};
31-
#[cfg(any(test, feature = "testsuite"))]
32-
use crate::Universe;
3333
use crate::{
3434
Actor, ActorExitStatus, ActorState, AskError, Command, DeferableReplyHandler, Mailbox,
3535
SendError, TrySendError,

quickwit/quickwit-actors/src/channel_with_priority.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use std::sync::atomic::{AtomicBool, Ordering};
1615
use std::sync::Mutex;
16+
use std::sync::atomic::{AtomicBool, Ordering};
1717

1818
use flume::TryRecvError;
1919
use thiserror::Error;

quickwit/quickwit-actors/src/envelope.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ use crate::{Actor, ActorContext, ActorExitStatus};
2929
/// queue with a single type.
3030
/// Before appending, we capture the right handler implementation
3131
/// in the form of a `Box<dyn Envelope>`, and append that to the queue.
32-
3332
pub struct Envelope<A> {
3433
handler_envelope: Box<dyn EnvelopeT<A>>,
3534
_no_advance_time_guard: Option<NoAdvanceTimeGuard>,

quickwit/quickwit-actors/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub(crate) mod scheduler;
4242
mod spawn_builder;
4343
mod supervisor;
4444

45-
pub use scheduler::{start_scheduler, SchedulerClient};
45+
pub use scheduler::{SchedulerClient, start_scheduler};
4646

4747
#[cfg(test)]
4848
pub(crate) mod tests;

quickwit/quickwit-actors/src/mailbox.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use quickwit_common::metrics::{GaugeGuard, IntCounter, IntGauge};
2323
use tokio::sync::oneshot;
2424

2525
use crate::channel_with_priority::{Receiver, Sender, TrySendError};
26-
use crate::envelope::{wrap_in_envelope, Envelope};
26+
use crate::envelope::{Envelope, wrap_in_envelope};
2727
use crate::scheduler::SchedulerClient;
2828
use crate::{Actor, AskError, Command, DeferableReplyHandler, QueueCapacity, RecvError, SendError};
2929

quickwit/quickwit-actors/src/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ impl ActorJoinHandle {
256256
mod tests {
257257
use std::time::Duration;
258258

259-
use crate::tests::PingReceiverActor;
260259
use crate::Universe;
260+
use crate::tests::PingReceiverActor;
261261

262262
#[tokio::test]
263263
async fn test_registry() {

quickwit/quickwit-actors/src/scheduler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414

1515
use std::cmp::Reverse;
16-
use std::collections::binary_heap::PeekMut;
1716
use std::collections::BinaryHeap;
17+
use std::collections::binary_heap::PeekMut;
1818
use std::future::Future;
1919
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
2020
use std::sync::{Arc, Weak};
@@ -361,8 +361,8 @@ impl Scheduler {
361361

362362
#[cfg(test)]
363363
mod tests {
364-
use std::sync::atomic::{AtomicUsize, Ordering};
365364
use std::sync::Arc;
365+
use std::sync::atomic::{AtomicUsize, Ordering};
366366
use std::time::{Duration, Instant};
367367

368368
use async_trait::async_trait;

quickwit/quickwit-actors/src/spawn_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use tokio::sync::watch;
2121
use tracing::{debug, error, info};
2222

2323
use crate::envelope::Envelope;
24-
use crate::mailbox::{create_mailbox, Inbox};
24+
use crate::mailbox::{Inbox, create_mailbox};
2525
use crate::registry::{ActorJoinHandle, ActorRegistry};
2626
use crate::scheduler::{NoAdvanceTimeGuard, SchedulerClient};
2727
use crate::supervisor::Supervisor;

0 commit comments

Comments
 (0)