From 9570106ba20a76dde19e306c8f6787eb2ddf2e93 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 15 Aug 2023 20:14:25 -0400 Subject: [PATCH] trying to fix CI --- .github/workflows/ci.yml | 65 ++--------------------- examples/storage.rs | 17 ++---- glommio/Cargo.toml | 2 + glommio/benches/competing_io.rs | 6 +-- glommio/benches/tcp.rs | 3 +- glommio/src/channels/channel_mesh.rs | 3 +- glommio/src/channels/local_channel.rs | 8 +-- glommio/src/channels/sharding.rs | 4 +- glommio/src/channels/shared_channel.rs | 6 +-- glommio/src/controllers/deadline_queue.rs | 7 +-- glommio/src/executor/latch.rs | 10 +--- glommio/src/executor/mod.rs | 28 ++++------ glommio/src/executor/placement/mod.rs | 3 +- glommio/src/executor/placement/pq_tree.rs | 4 +- glommio/src/executor/stall.rs | 32 +++++------ glommio/src/io/bulk_io.rs | 4 +- glommio/src/io/directory.rs | 3 +- glommio/src/io/dma_file.rs | 9 +--- glommio/src/io/dma_file_stream.rs | 3 +- glommio/src/io/immutable_file.rs | 9 +--- glommio/src/io/mod.rs | 15 ++---- glommio/src/iou/completion_queue.rs | 3 +- glommio/src/iou/mod.rs | 3 +- glommio/src/iou/sqe.rs | 3 +- glommio/src/lib.rs | 59 ++++---------------- glommio/src/net/datagram.rs | 3 +- glommio/src/parking.rs | 3 +- glommio/src/reactor.rs | 24 ++------- glommio/src/sync/gate.rs | 5 +- glommio/src/sync/rwlock.rs | 8 +-- glommio/src/sync/semaphore.rs | 8 +-- glommio/src/sys/mod.rs | 3 +- glommio/src/sys/source.rs | 15 +----- glommio/src/sys/sysfs.rs | 8 ++- glommio/src/sys/uring.rs | 20 ++----- glommio/src/task/raw.rs | 3 +- glommio/tests/linters.rs | 10 ++-- rustfmt.toml | 8 --- 38 files changed, 93 insertions(+), 334 deletions(-) delete mode 100644 rustfmt.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4563e1d40..9e1ef6d88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache setup uses: ./.github/actions/cache-setup @@ -26,24 +26,6 @@ jobs: - name: Generate documentation run: cargo doc --all - doc-nightly: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Cache setup - uses: ./.github/actions/cache-setup - - - name: Install cargo-deadlinks - run: which deadlinks || cargo install cargo-deadlinks - - - name: Generate documentation - run: | - rustup install nightly - cargo +nightly doc --all - # temporarily disabled. # - name: Validate links # run: cargo deadlinks --dir target/doc/glommio @@ -53,7 +35,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache setup uses: ./.github/actions/cache-setup @@ -61,27 +43,12 @@ jobs: - name: Build all targets run: cargo build --all --all-targets - build-nightly: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Cache setup - uses: ./.github/actions/cache-setup - - - name: Build all targets on the nigthly channel - run: > - rustup install nightly; - cargo +nightly build --all --all-targets --features=nightly - test: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache setup uses: ./.github/actions/cache-setup @@ -91,8 +58,6 @@ jobs: cat << EOF > "run-gha-workflow.sh" PATH=$PATH:/usr/share/rust/.cargo/bin echo "`nproc` CPU(s) available" - rustup install nightly - rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu rustup install 1.58 rustup show rustup default stable @@ -100,27 +65,3 @@ jobs: cargo test -- --test-threads=`nproc` EOF sudo -E bash -c "ulimit -Sl 512 && ulimit -Hl 512 && bash run-gha-workflow.sh" - - test-nightly: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Cache setup - uses: ./.github/actions/cache-setup - - - name: Install cargo helpers and test all targets on the nigthly channel - run: | - cat << EOF > "run-gha-workflow.sh" - PATH=$PATH:/usr/share/rust/.cargo/bin - echo "`nproc` CPU(s) available" - rustup install nightly - rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu - rustup install 1.58 - cargo install cargo-sort - rustup show - cargo +nightly test --features=nightly -- --test-threads=`nproc` - EOF - sudo -E bash -c "ulimit -Sl 512 && ulimit -Hl 512 && bash run-gha-workflow.sh" diff --git a/examples/storage.rs b/examples/storage.rs index d6ea9c5cb..770997bc8 100644 --- a/examples/storage.rs +++ b/examples/storage.rs @@ -1,24 +1,15 @@ use clap::{App, Arg}; use futures_lite::{ stream::{self, StreamExt}, - AsyncReadExt, - AsyncWriteExt, + AsyncReadExt, AsyncWriteExt, }; use glommio::{ enclose, io::{ - BufferedFile, - DmaFile, - DmaStreamReader, - DmaStreamReaderBuilder, - DmaStreamWriterBuilder, - MergedBufferLimit, - ReadAmplificationLimit, - StreamReaderBuilder, - StreamWriterBuilder, + BufferedFile, DmaFile, DmaStreamReader, DmaStreamReaderBuilder, DmaStreamWriterBuilder, + MergedBufferLimit, ReadAmplificationLimit, StreamReaderBuilder, StreamWriterBuilder, }, - LocalExecutorBuilder, - Placement, + LocalExecutorBuilder, Placement, }; use pretty_bytes::converter; use std::{ diff --git a/glommio/Cargo.toml b/glommio/Cargo.toml index 2e567f4f4..c2589b6aa 100755 --- a/glommio/Cargo.toml +++ b/glommio/Cargo.toml @@ -14,6 +14,8 @@ homepage = "https://github.com/DataDog/glommio" keywords = ["linux", "rust", "async", "iouring", "thread-per-core"] categories = ["asynchronous", "concurrency", "os", "filesystem", "network-programming"] readme = "../README.md" +# This is also documented in the README.md under "Supported Rust Versions" +rust-version = "1.58" [dependencies] ahash = "0.7" diff --git a/glommio/benches/competing_io.rs b/glommio/benches/competing_io.rs index 97a3f07e0..79d27456e 100644 --- a/glommio/benches/competing_io.rs +++ b/glommio/benches/competing_io.rs @@ -3,10 +3,7 @@ use futures_lite::AsyncWriteExt; use glommio::{ enclose, io::{ImmutableFile, ImmutableFileBuilder}, - Latency, - LocalExecutorBuilder, - Placement, - Shares, + Latency, LocalExecutorBuilder, Placement, Shares, }; use rand::Rng; use std::{ @@ -102,7 +99,6 @@ async fn run_io(name: &str, file: &ImmutableFile, count: usize, size: usize) { let started_at = Instant::now(); let tasks: Vec<_> = (0..2 << 10) - .into_iter() .map(|_| { let file = file.clone(); let hist = hist.clone(); diff --git a/glommio/benches/tcp.rs b/glommio/benches/tcp.rs index 90577c884..facd01fbc 100644 --- a/glommio/benches/tcp.rs +++ b/glommio/benches/tcp.rs @@ -5,8 +5,7 @@ use futures_lite::{ use glommio::{ enclose, net::{TcpListener, TcpStream}, - LocalExecutorBuilder, - Placement, + LocalExecutorBuilder, Placement, }; use std::{ cell::Cell, diff --git a/glommio/src/channels/channel_mesh.rs b/glommio/src/channels/channel_mesh.rs index 824505f2b..f8dd4266c 100644 --- a/glommio/src/channels/channel_mesh.rs +++ b/glommio/src/channels/channel_mesh.rs @@ -13,8 +13,7 @@ use std::sync::{Arc, RwLock}; use crate::{ channels::shared_channel::{self, *}, - GlommioError, - Result, + GlommioError, Result, }; /// Sender side diff --git a/glommio/src/channels/local_channel.rs b/glommio/src/channels/local_channel.rs index 194c0a977..8fc23b42b 100644 --- a/glommio/src/channels/local_channel.rs +++ b/glommio/src/channels/local_channel.rs @@ -13,13 +13,7 @@ use std::{ }; use intrusive_collections::{ - container_of, - linked_list::LinkOps, - offset_of, - Adapter, - LinkedList, - LinkedListLink, - PointerOps, + container_of, linked_list::LinkOps, offset_of, Adapter, LinkedList, LinkedListLink, PointerOps, }; use std::{collections::VecDeque, marker::PhantomPinned, ptr::NonNull}; diff --git a/glommio/src/channels/sharding.rs b/glommio/src/channels/sharding.rs index 6cf91f0b3..98035bc73 100644 --- a/glommio/src/channels/sharding.rs +++ b/glommio/src/channels/sharding.rs @@ -9,9 +9,7 @@ use futures_lite::{Future, Stream, StreamExt}; use crate::{ channels::channel_mesh::{FullMesh, Senders}, task::JoinHandle, - GlommioError, - ResourceType, - Result, + GlommioError, ResourceType, Result, }; /// Alias for return type of `Handler` diff --git a/glommio/src/channels/shared_channel.rs b/glommio/src/channels/shared_channel.rs index c9393f85b..e022a1a35 100644 --- a/glommio/src/channels/shared_channel.rs +++ b/glommio/src/channels/shared_channel.rs @@ -9,8 +9,7 @@ use crate::{ enclose, reactor::Reactor, sys::{self, SleepNotifier}, - GlommioError, - ResourceType, + GlommioError, ResourceType, }; use futures_lite::{future, stream::Stream}; use std::{ @@ -491,8 +490,7 @@ mod test { use super::*; use crate::{ timer::{sleep, Timer}, - LocalExecutorBuilder, - Placement, + LocalExecutorBuilder, Placement, }; use futures_lite::{FutureExt, StreamExt}; use std::{ diff --git a/glommio/src/controllers/deadline_queue.rs b/glommio/src/controllers/deadline_queue.rs index 1d82ae29d..64767027d 100644 --- a/glommio/src/controllers/deadline_queue.rs +++ b/glommio/src/controllers/deadline_queue.rs @@ -6,12 +6,7 @@ use crate::{ channels::local_channel::{self, LocalReceiver, LocalSender}, controllers::ControllerStatus, - enclose, - task, - Latency, - Shares, - SharesManager, - TaskQueueHandle, + enclose, task, Latency, Shares, SharesManager, TaskQueueHandle, }; use futures_lite::StreamExt; use log::{trace, warn}; diff --git a/glommio/src/executor/latch.rs b/glommio/src/executor/latch.rs index bdbb42957..650ce1845 100644 --- a/glommio/src/executor/latch.rs +++ b/glommio/src/executor/latch.rs @@ -14,9 +14,7 @@ use std::sync::{ atomic::{AtomicUsize, Ordering}, - Arc, - Condvar, - Mutex, + Arc, Condvar, Mutex, }; #[derive(Clone, Debug)] @@ -156,10 +154,7 @@ mod test { #[test] fn cancel() { let n = 1 << 10; - let cxl_ids = (n / 2..n + 1) - .into_iter() - .step_by(n / 2 / 5) - .collect::>(); + let cxl_ids = (n / 2..n + 1).step_by(n / 2 / 5).collect::>(); assert_eq!(6, cxl_ids.len()); let (w, a, t) = helper(cxl_ids, n); @@ -193,7 +188,6 @@ mod test { let latch = Latch::new(count); let cxl_ids = Arc::new(cxl_ids); let res = (0..count) - .into_iter() .map(|id| { std::thread::spawn({ let l = Latch::clone(&latch); diff --git a/glommio/src/executor/mod.rs b/glommio/src/executor/mod.rs index c0f37868d..a3c215b6e 100644 --- a/glommio/src/executor/mod.rs +++ b/glommio/src/executor/mod.rs @@ -36,16 +36,9 @@ use crate::{ error::BuilderErrorKind, executor::stall::StallDetector, io::DmaBuffer, - parking, - reactor, - sys, + parking, reactor, sys, task::{self, waker_fn::dummy_waker}, - GlommioError, - IoRequirements, - IoStats, - Latency, - Reactor, - Shares, + GlommioError, IoRequirements, IoStats, Latency, Reactor, Shares, }; use ahash::AHashMap; use futures_lite::pin; @@ -1459,7 +1452,7 @@ impl LocalExecutor { let spin_before_park = self.spin_before_park().unwrap_or_default(); let future = this - .spawn_into(async move { future.await }, TaskQueueHandle::default()) + .spawn_into(future, TaskQueueHandle::default()) .unwrap() .detach(); pin!(future); @@ -2843,8 +2836,7 @@ mod test { collections::HashMap, sync::{ atomic::{AtomicUsize, Ordering}, - Arc, - Mutex, + Arc, Mutex, }, task::Waker, }; @@ -3696,18 +3688,16 @@ mod test { fut_output.sort_unstable(); - assert_eq!(fut_output, (0..nr_cpus).into_iter().collect::>()); + assert_eq!(fut_output, (0..nr_cpus).collect::>()); assert_eq!(nr_cpus, count.load(Ordering::Relaxed)); } #[test] fn executor_invalid_executor_count() { - assert!( - LocalExecutorPoolBuilder::new(PoolPlacement::Unbound(0)) - .on_all_shards(|| async move {}) - .is_err() - ); + assert!(LocalExecutorPoolBuilder::new(PoolPlacement::Unbound(0)) + .on_all_shards(|| async move {}) + .is_err()); } #[test] @@ -3887,7 +3877,7 @@ mod test { .collect::>(); values.sort_unstable(); - assert_eq!(values, (0..nr_execs).into_iter().collect::>()); + assert_eq!(values, (0..nr_execs).collect::>()); } #[test] diff --git a/glommio/src/executor/placement/mod.rs b/glommio/src/executor/placement/mod.rs index 335fe7e3e..b6720eaab 100644 --- a/glommio/src/executor/placement/mod.rs +++ b/glommio/src/executor/placement/mod.rs @@ -51,8 +51,7 @@ use crate::{error::BuilderErrorKind, sys::hardware_topology, CpuLocation, Glommi use pq_tree::{ marker::{Pack, Priority, Spread}, - Level, - Node, + Level, Node, }; use std::{ collections::{ diff --git a/glommio/src/executor/placement/pq_tree.rs b/glommio/src/executor/placement/pq_tree.rs index 4fb01426d..587238e42 100644 --- a/glommio/src/executor/placement/pq_tree.rs +++ b/glommio/src/executor/placement/pq_tree.rs @@ -282,7 +282,7 @@ mod test { assert_eq!(node_root.nr_slots(), total_cpus); assert_eq!(node_root.nr_slots_selected(), 0); - let mut set = (0..total_cpus).into_iter().collect::>(); + let mut set = (0..total_cpus).collect::>(); for ii in 0..total_cpus { if let Some(Level::Cpu(cpu_id)) = node_root.select_cpu().last() { @@ -329,7 +329,7 @@ mod test { assert_eq!(node_root.nr_slots(), total_cpus); assert_eq!(node_root.nr_slots_selected(), 0); - let mut set = (0..total_cpus).into_iter().collect::>(); + let mut set = (0..total_cpus).collect::>(); for ii in 0..total_cpus { if let Some(Level::Cpu(cpu_id)) = node_root.select_cpu().last() { diff --git a/glommio/src/executor/stall.rs b/glommio/src/executor/stall.rs index 55461356d..009d0eeec 100644 --- a/glommio/src/executor/stall.rs +++ b/glommio/src/executor/stall.rs @@ -367,15 +367,13 @@ mod test { exec.yield_task_queue_now().await; // yield the queue - assert!( - stall_handler - .inner - .write() - .unwrap() - .detections - .pop() - .is_some() - ); + assert!(stall_handler + .inner + .write() + .unwrap() + .detections + .pop() + .is_some()); // no stall because < 50ms of un-cooperativeness thread::sleep(Duration::from_millis(40)); @@ -395,15 +393,13 @@ mod test { exec.yield_task_queue_now().await; // yield the queue - assert!( - stall_handler - .inner - .write() - .unwrap() - .detections - .pop() - .is_some() - ); + assert!(stall_handler + .inner + .write() + .unwrap() + .detections + .pop() + .is_some()); // Make sure nothing else was reported exec.yield_task_queue_now().await; // yield the queue diff --git a/glommio/src/io/bulk_io.rs b/glommio/src/io/bulk_io.rs index 45423ef65..e86018dde 100644 --- a/glommio/src/io/bulk_io.rs +++ b/glommio/src/io/bulk_io.rs @@ -1,8 +1,6 @@ use crate::io::{ dma_file::{align_down, align_up}, - DmaFile, - ReadResult, - ScheduledSource, + DmaFile, ReadResult, ScheduledSource, }; use core::task::{Context, Poll}; use futures_lite::{ready, Stream, StreamExt}; diff --git a/glommio/src/io/directory.rs b/glommio/src/io/directory.rs index d855dbadc..1cec4987c 100644 --- a/glommio/src/io/directory.rs +++ b/glommio/src/io/directory.rs @@ -5,8 +5,7 @@ // use crate::{ io::{dma_file::DmaFile, glommio_file::GlommioFile}, - sys, - GlommioError, + sys, GlommioError, }; use std::{ cell::Ref, diff --git a/glommio/src/io/dma_file.rs b/glommio/src/io/dma_file.rs index 8b808180e..88b0ddf34 100644 --- a/glommio/src/io/dma_file.rs +++ b/glommio/src/io/dma_file.rs @@ -6,13 +6,8 @@ use crate::{ io::{ bulk_io::{ - CoalescedReads, - IoVec, - MergedBufferLimit, - OrderedBulkIo, - ReadAmplificationLimit, - ReadManyArgs, - ReadManyResult, + CoalescedReads, IoVec, MergedBufferLimit, OrderedBulkIo, ReadAmplificationLimit, + ReadManyArgs, ReadManyResult, }, glommio_file::GlommioFile, open_options::OpenOptions, diff --git a/glommio/src/io/dma_file_stream.rs b/glommio/src/io/dma_file_stream.rs index da64e52fb..d1597c192 100644 --- a/glommio/src/io/dma_file_stream.rs +++ b/glommio/src/io/dma_file_stream.rs @@ -6,8 +6,7 @@ use crate::{ io::{dma_file::align_down, read_result::ReadResult, DmaFile}, sys::DmaBuffer, - task, - ByteSliceMutExt, + task, ByteSliceMutExt, }; use ahash::AHashMap; use core::task::Waker; diff --git a/glommio/src/io/immutable_file.rs b/glommio/src/io/immutable_file.rs index 21cbb7bcd..2b368d51d 100644 --- a/glommio/src/io/immutable_file.rs +++ b/glommio/src/io/immutable_file.rs @@ -6,13 +6,8 @@ use crate::io::{ bulk_io::{MergedBufferLimit, ReadAmplificationLimit, ReadManyArgs}, open_options::OpenOptions, - DmaStreamReaderBuilder, - DmaStreamWriter, - DmaStreamWriterBuilder, - IoVec, - ReadManyResult, - ReadResult, - ScheduledSource, + DmaStreamReaderBuilder, DmaStreamWriter, DmaStreamWriterBuilder, IoVec, ReadManyResult, + ReadResult, ScheduledSource, }; use futures_lite::{future::poll_fn, io::AsyncWrite, Stream}; use std::{ diff --git a/glommio/src/io/mod.rs b/glommio/src/io/mod.rs index 6045461b1..71ae771d5 100644 --- a/glommio/src/io/mod.rs +++ b/glommio/src/io/mod.rs @@ -116,7 +116,9 @@ macro_rules! enhanced_try { } } }}; - ($expr:expr, $op:expr, $obj:expr) => {{ enhanced_try!($expr, $op, $obj.path(), Some($obj.as_raw_fd())) }}; + ($expr:expr, $op:expr, $obj:expr) => {{ + enhanced_try!($expr, $op, $obj.path(), Some($obj.as_raw_fd())) + }}; } mod buffered_file; @@ -156,20 +158,13 @@ pub(crate) use self::sched::{FileScheduler, IoScheduler, ScheduledSource}; pub use self::{ buffered_file::BufferedFile, buffered_file_stream::{ - stdin, - StreamReader, - StreamReaderBuilder, - StreamWriter, - StreamWriterBuilder, + stdin, StreamReader, StreamReaderBuilder, StreamWriter, StreamWriterBuilder, }, bulk_io::{IoVec, MergedBufferLimit, ReadAmplificationLimit, ReadManyResult}, directory::Directory, dma_file::{CloseResult, DmaFile}, dma_file_stream::{ - DmaStreamReader, - DmaStreamReaderBuilder, - DmaStreamWriter, - DmaStreamWriterBuilder, + DmaStreamReader, DmaStreamReaderBuilder, DmaStreamWriter, DmaStreamWriterBuilder, }, immutable_file::{ImmutableFile, ImmutableFileBuilder, ImmutableFilePreSealSink}, open_options::OpenOptions, diff --git a/glommio/src/iou/completion_queue.rs b/glommio/src/iou/completion_queue.rs index 651d661e9..f1ca000fe 100644 --- a/glommio/src/iou/completion_queue.rs +++ b/glommio/src/iou/completion_queue.rs @@ -1,6 +1,5 @@ use std::{ - fmt, - io, + fmt, io, marker::PhantomData, mem::MaybeUninit, ptr::{self, NonNull}, diff --git a/glommio/src/iou/mod.rs b/glommio/src/iou/mod.rs index b4681a6ad..b558892db 100644 --- a/glommio/src/iou/mod.rs +++ b/glommio/src/iou/mod.rs @@ -58,8 +58,7 @@ mod probe; pub mod registrar; use std::{ - fmt, - io, + fmt, io, mem::{self, MaybeUninit}, os::unix::io::RawFd, ptr::{self, NonNull}, diff --git a/glommio/src/iou/sqe.rs b/glommio/src/iou/sqe.rs index 6f9ae530b..c4a0942b5 100644 --- a/glommio/src/iou/sqe.rs +++ b/glommio/src/iou/sqe.rs @@ -1,7 +1,6 @@ use std::{ ffi::CStr, - io, - mem, + io, mem, ops::{Deref, DerefMut}, os::unix::io::RawFd, ptr, diff --git a/glommio/src/lib.rs b/glommio/src/lib.rs index 08af5afb2..c51020786 100644 --- a/glommio/src/lib.rs +++ b/glommio/src/lib.rs @@ -442,38 +442,16 @@ use crate::reactor::Reactor; pub use crate::{ byte_slice_ext::{ByteSliceExt, ByteSliceMutExt}, error::{ - BuilderErrorKind, - ExecutorErrorKind, - GlommioError, - QueueErrorKind, - ReactorErrorKind, - ResourceType, - Result, + BuilderErrorKind, ExecutorErrorKind, GlommioError, QueueErrorKind, ReactorErrorKind, + ResourceType, Result, }, executor::{ - allocate_dma_buffer, - allocate_dma_buffer_global, - executor, - spawn_local, - spawn_local_into, - spawn_scoped_local, - spawn_scoped_local_into, + allocate_dma_buffer, allocate_dma_buffer_global, executor, spawn_local, spawn_local_into, + spawn_scoped_local, spawn_scoped_local_into, stall::{DefaultStallDetectionHandler, StallDetectionHandler}, - yield_if_needed, - CpuSet, - ExecutorJoinHandle, - ExecutorProxy, - ExecutorStats, - LocalExecutor, - LocalExecutorBuilder, - LocalExecutorPoolBuilder, - Placement, - PoolPlacement, - PoolThreadHandles, - ScopedTask, - Task, - TaskQueueHandle, - TaskQueueStats, + yield_if_needed, CpuSet, ExecutorJoinHandle, ExecutorProxy, ExecutorStats, LocalExecutor, + LocalExecutorBuilder, LocalExecutorPoolBuilder, Placement, PoolPlacement, + PoolThreadHandles, ScopedTask, Task, TaskQueueHandle, TaskQueueStats, }, shares::{Shares, SharesManager}, sys::hardware_topology::CpuLocation, @@ -491,25 +469,10 @@ use std::{ pub mod prelude { #[doc(no_inline)] pub use crate::{ - error::GlommioError, - executor, - spawn_local, - spawn_local_into, - yield_if_needed, - ByteSliceExt, - ByteSliceMutExt, - ExecutorProxy, - IoStats, - Latency, - LocalExecutor, - LocalExecutorBuilder, - LocalExecutorPoolBuilder, - Placement, - PoolPlacement, - PoolThreadHandles, - RingIoStats, - Shares, - TaskQueueHandle, + error::GlommioError, executor, spawn_local, spawn_local_into, yield_if_needed, + ByteSliceExt, ByteSliceMutExt, ExecutorProxy, IoStats, Latency, LocalExecutor, + LocalExecutorBuilder, LocalExecutorPoolBuilder, Placement, PoolPlacement, + PoolThreadHandles, RingIoStats, Shares, TaskQueueHandle, }; } diff --git a/glommio/src/net/datagram.rs b/glommio/src/net/datagram.rs index 14ec1e45f..4a54cb983 100644 --- a/glommio/src/net/datagram.rs +++ b/glommio/src/net/datagram.rs @@ -5,8 +5,7 @@ // use crate::{ sys::{self, DmaBuffer, Source, SourceType}, - ByteSliceMutExt, - Reactor, + ByteSliceMutExt, Reactor, }; use nix::sys::socket::MsgFlags; use std::{ diff --git a/glommio/src/parking.rs b/glommio/src/parking.rs index a3f5bc67e..96fbdfa74 100644 --- a/glommio/src/parking.rs +++ b/glommio/src/parking.rs @@ -25,8 +25,7 @@ //! going between task execution and I/O. use std::{ - fmt, - io, + fmt, io, panic::{RefUnwindSafe, UnwindSafe}, rc::Rc, time::Duration, diff --git a/glommio/src/reactor.rs b/glommio/src/reactor.rs index acb3dd175..a49b7a41f 100644 --- a/glommio/src/reactor.rs +++ b/glommio/src/reactor.rs @@ -11,8 +11,7 @@ use std::{ ffi::CString, fmt, future::Future, - io, - mem, + io, mem, os::unix::{ffi::OsStrExt, io::RawFd}, path::Path, rc::Rc, @@ -33,25 +32,10 @@ use crate::{ io::{FileScheduler, IoScheduler, ScheduledSource}, iou::sqe::SockAddrStorage, sys::{ - self, - common_flags, - read_flags, - sysfs, - DirectIo, - DmaBuffer, - DmaSource, - IoBuffer, - PollableStatus, - SleepNotifier, - Source, - SourceType, - StatsCollection, - Statx, + self, common_flags, read_flags, sysfs, DirectIo, DmaBuffer, DmaSource, IoBuffer, + PollableStatus, SleepNotifier, Source, SourceType, StatsCollection, Statx, }, - IoRequirements, - IoStats, - PoolPlacement, - TaskQueueHandle, + IoRequirements, IoStats, PoolPlacement, TaskQueueHandle, }; use nix::poll::PollFlags; diff --git a/glommio/src/sync/gate.rs b/glommio/src/sync/gate.rs index f6e4e11fa..9c7f12bfe 100644 --- a/glommio/src/sync/gate.rs +++ b/glommio/src/sync/gate.rs @@ -7,10 +7,7 @@ use futures_lite::Future; use crate::{ channels::local_channel::{self, LocalSender}, - GlommioError, - ResourceType, - Task, - TaskQueueHandle, + GlommioError, ResourceType, Task, TaskQueueHandle, }; #[derive(Debug)] diff --git a/glommio/src/sync/rwlock.rs b/glommio/src/sync/rwlock.rs index 0b3f24fc9..fabc66ece 100644 --- a/glommio/src/sync/rwlock.rs +++ b/glommio/src/sync/rwlock.rs @@ -40,13 +40,7 @@ use std::{ }; use intrusive_collections::{ - container_of, - linked_list::LinkOps, - offset_of, - Adapter, - LinkedList, - LinkedListLink, - PointerOps, + container_of, linked_list::LinkOps, offset_of, Adapter, LinkedList, LinkedListLink, PointerOps, }; use crate::{GlommioError, ResourceType}; diff --git a/glommio/src/sync/semaphore.rs b/glommio/src/sync/semaphore.rs index 57cb8e44b..1d0e6463e 100644 --- a/glommio/src/sync/semaphore.rs +++ b/glommio/src/sync/semaphore.rs @@ -12,13 +12,7 @@ use std::{ }; use intrusive_collections::{ - container_of, - linked_list::LinkOps, - offset_of, - Adapter, - LinkedList, - LinkedListLink, - PointerOps, + container_of, linked_list::LinkOps, offset_of, Adapter, LinkedList, LinkedListLink, PointerOps, }; use std::{marker::PhantomPinned, ptr::NonNull, rc::Rc}; diff --git a/glommio/src/sys/mod.rs b/glommio/src/sys/mod.rs index ec8bae497..9fe2d6fc2 100644 --- a/glommio/src/sys/mod.rs +++ b/glommio/src/sys/mod.rs @@ -7,8 +7,7 @@ use crate::{to_io_error, uring_sys}; use ahash::AHashMap; use log::debug; use std::{ - fmt, - io, + fmt, io, io::Error, mem::{ManuallyDrop, MaybeUninit}, net::{Shutdown, TcpStream}, diff --git a/glommio/src/sys/source.rs b/glommio/src/sys/source.rs index c8c5dc447..b6d0b547e 100644 --- a/glommio/src/sys/source.rs +++ b/glommio/src/sys/source.rs @@ -6,21 +6,10 @@ use crate::{ iou::sqe::{SockAddr, SockAddrStorage}, sys::{ - DmaBuffer, - IoBuffer, - OsResult, - PollableStatus, - ReactorQueue, - SourceId, - Statx, - TimeSpec64, + DmaBuffer, IoBuffer, OsResult, PollableStatus, ReactorQueue, SourceId, Statx, TimeSpec64, Wakers, }, - GlommioError, - IoRequirements, - ReactorErrorKind, - RingIoStats, - TaskQueueHandle, + GlommioError, IoRequirements, ReactorErrorKind, RingIoStats, TaskQueueHandle, }; use futures_lite::{future, io}; use std::{ diff --git a/glommio/src/sys/sysfs.rs b/glommio/src/sys/sysfs.rs index 2fc6c5386..e392e45da 100644 --- a/glommio/src/sys/sysfs.rs +++ b/glommio/src/sys/sysfs.rs @@ -800,11 +800,9 @@ mod test { assert!(ListIterator::from_str("5-80:0/1\0")?.all(|e| e.is_ok())); assert!(ListIterator::from_str(",,1,,4-6,, ,,\0")?.any(|e| e.is_ok())); - assert!( - ListIterator::from_str("collect_ok_err\0")? - .collect_ok::>() - .is_err() - ); + assert!(ListIterator::from_str("collect_ok_err\0")? + .collect_ok::>() + .is_err()); Ok(()) } diff --git a/glommio/src/sys/uring.rs b/glommio/src/sys/uring.rs index 607d3f706..b04016873 100644 --- a/glommio/src/sys/uring.rs +++ b/glommio/src/sys/uring.rs @@ -36,25 +36,11 @@ use crate::{ self, blocking::{BlockingThreadOp, BlockingThreadPool}, dma_buffer::{BufferStorage, DmaBuffer}, - membarrier, - DirectIo, - EnqueuedSource, - EnqueuedStatus, - InnerSource, - IoBuffer, - PollableStatus, - Source, - SourceType, - Statx, - TimeSpec64, + membarrier, DirectIo, EnqueuedSource, EnqueuedStatus, InnerSource, IoBuffer, + PollableStatus, Source, SourceType, Statx, TimeSpec64, }, uring_sys::{self, IoRingOp}, - GlommioError, - IoRequirements, - IoStats, - PoolPlacement, - ReactorErrorKind, - RingIoStats, + GlommioError, IoRequirements, IoStats, PoolPlacement, ReactorErrorKind, RingIoStats, TaskQueueHandle, }; use ahash::AHashMap; diff --git a/glommio/src/task/raw.rs b/glommio/src/task/raw.rs index 98773ffb0..5727770b3 100644 --- a/glommio/src/task/raw.rs +++ b/glommio/src/task/raw.rs @@ -18,8 +18,7 @@ use std::sync::atomic::{AtomicI16, Ordering}; #[cfg(feature = "debugging")] use crate::task::debugging::TaskDebugger; use crate::{ - dbg_context, - sys, + dbg_context, sys, task::{ header::Header, state::*, diff --git a/glommio/tests/linters.rs b/glommio/tests/linters.rs index 76d4caf4c..fa6f70be1 100644 --- a/glommio/tests/linters.rs +++ b/glommio/tests/linters.rs @@ -9,20 +9,16 @@ mod tests { #[test] fn check_formatting() { let status = Command::new("cargo") - .args(["+nightly", "fmt", "--all", "--", "--check"]) + .args(["fmt", "--all", "--", "--check"]) .status() .unwrap(); - assert!( - status.success(), - "cargo fmt failed. Note that glommio uses nightly for formatting, so please invoke \ - cargo with +nightly" - ); + assert!(status.success()); } #[test] fn check_clippy() { let status = Command::new("cargo") - .args(["+stable", "clippy", "--all-targets", "--", "-D", "warnings"]) + .args(["clippy", "--all-targets", "--", "-D", "warnings"]) .status() .unwrap(); assert!(status.success()); diff --git a/rustfmt.toml b/rustfmt.toml deleted file mode 100644 index a5f0756c7..000000000 --- a/rustfmt.toml +++ /dev/null @@ -1,8 +0,0 @@ -version = "Two" -wrap_comments = true -format_strings = true -format_code_in_doc_comments = true -edition = "2018" -imports_granularity="Crate" -imports_layout = "HorizontalVertical" -reorder_imports = true