cleanup and rustfmt

actix-rt/src/arbiter.rs

@@ -95,7 +95,6 @@ impl Arbiter {
     ///
     /// # Panics
     /// Panics if a [System] is not registered on the current thread.
-    //#[cfg(not(all(target_os = "linux", feature = "io-uring")))]
     #[allow(clippy::new_without_default)]
     pub fn new() -> Arbiter {
         Self::with_tokio_rt(|| {
@@ -107,7 +106,6 @@ impl Arbiter {
     /// Spawn a new Arbiter using the [Tokio Runtime](tokio-runtime) returned from a closure.
     ///
     /// [tokio-runtime]: tokio::runtime::Runtime
-    //#[cfg(not(all(target_os = "linux", feature = "io-uring")))]
     pub fn with_tokio_rt<F>(runtime_factory: F) -> Arbiter
     where
         F: Fn() -> crate::runtime::GlobalRuntime + Send + 'static,
@@ -158,58 +156,6 @@ impl Arbiter {
         Arbiter { tx, thread_handle }
     }
 
-    /// Spawn a new Arbiter thread and start its event loop with `tokio-uring` runtime.
-    ///
-    /// # Panics
-    /// Panics if a [System] is not registered on the current thread.
-    /*#[cfg(all(target_os = "linux", feature = "io-uring"))]
-    #[allow(clippy::new_without_default)]
-    pub fn new() -> Arbiter {
-        let sys = System::current();
-        let system_id = sys.id();
-        let arb_id = COUNT.fetch_add(1, Ordering::Relaxed);
-
-        let name = format!("actix-rt|system:{}|arbiter:{}", system_id, arb_id);
-        let (tx, rx) = mpsc::unbounded_channel();
-
-        let (ready_tx, ready_rx) = std::sync::mpsc::channel::<()>();
-
-        let thread_handle = thread::Builder::new()
-            .name(name.clone())
-            .spawn({
-                let tx = tx.clone();
-                move || {
-                    let hnd = ArbiterHandle::new(tx);
-
-                    System::set_current(sys);
-
-                    HANDLE.with(|cell| *cell.borrow_mut() = Some(hnd.clone()));
-
-                    // register arbiter
-                    let _ = System::current()
-                        .tx()
-                        .send(SystemCommand::RegisterArbiter(arb_id, hnd));
-
-                    ready_tx.send(()).unwrap();
-
-                    // run arbiter event processing loop
-                    tokio_uring::start(ArbiterRunner { rx });
-
-                    // deregister arbiter
-                    let _ = System::current()
-                        .tx()
-                        .send(SystemCommand::DeregisterArbiter(arb_id));
-                }
-            })
-            .unwrap_or_else(|err| {
-                panic!("Cannot spawn Arbiter's thread: {:?}. {:?}", &name, err)
-            });
-
-        ready_rx.recv().unwrap();
-
-        Arbiter { tx, thread_handle }
-    }*/
-
     /// Sets up an Arbiter runner in a new System using the environment's local set.
     pub(crate) fn in_new_system() -> ArbiterHandle {
         let (tx, rx) = mpsc::unbounded_channel();

actix-rt/src/runtime.rs

@@ -6,7 +6,7 @@ use tokio::task::{JoinHandle, LocalSet};
 ///
 /// All spawned futures will be executed on the current thread. Therefore, there is no `Send` bound
 /// on submitted futures.
-#[cfg_attr(not(all(target_os = "linux", feature = "io-uring")),derive(Debug))]
+#[cfg_attr(not(all(target_os = "linux", feature = "io-uring")), derive(Debug))]
 pub struct Runtime {
     local: LocalSet,
     rt: GlobalRuntime,

actix-rt/src/system.rs

@@ -29,7 +29,6 @@ pub struct System {
     arbiter_handle: ArbiterHandle,
 }
 
-//#[cfg(not(feature = "io-uring"))]
 impl System {
     /// Create a new system.
     ///
@@ -193,7 +192,6 @@ impl System {
 }
 
 /// Runner that keeps a [System]'s event loop alive until stop message is received.
-//#[cfg(not(feature = "io-uring"))]
 #[must_use = "A SystemRunner does nothing unless `run` is called."]
 #[derive(Debug)]
 pub struct SystemRunner {
@@ -201,7 +199,6 @@ pub struct SystemRunner {
     stop_rx: oneshot::Receiver<i32>,
 }
 
-//#[cfg(not(feature = "io-uring"))]
 impl SystemRunner {
     /// Starts event loop and will return once [System] is [stopped](System::stop).
     pub fn run(self) -> io::Result<()> {
@@ -232,55 +229,6 @@ impl SystemRunner {
         self.rt.block_on(fut)
     }
 }
-/*
-/// Runner that keeps a [System]'s event loop alive until stop message is received.
-#[cfg(feature = "io-uring")]
-#[must_use = "A SystemRunner does nothing unless `run` is called."]
-#[derive(Debug)]
-pub struct SystemRunner {
-    rt: crate::runtime::Runtime,
-    stop_rx: oneshot::Receiver<i32>,
-}
-
-#[cfg(feature = "io-uring")]
-impl SystemRunner {
-    /// Starts event loop and will return once [System] is [stopped](System::stop).
-    pub fn run(self) -> io::Result<()> {
-        unimplemented!("SystemRunner::run is not implemented for io-uring feature yet");
-    }
-
-    /// Runs the event loop until [stopped](System::stop_with_code), returning the exit code.
-    pub fn run_with_code(self) -> io::Result<i32> {
-        unimplemented!(
-            "SystemRunner::run_with_code is not implemented for io-uring feature yet"
-        );
-    }
-
-    /// Runs the provided future, blocking the current thread until the future completes.
-    #[inline]
-    pub fn block_on<F: Future>(&self, fut: F) -> F::Output {
-        tokio_uring::start(async move {
-            let (stop_tx, stop_rx) = oneshot::channel();
-            let (sys_tx, sys_rx) = mpsc::unbounded_channel();
-
-            let sys_arbiter = Arbiter::in_new_system();
-            let system = System::construct(sys_tx, sys_arbiter.clone());
-
-            system
-                .tx()
-                .send(SystemCommand::RegisterArbiter(usize::MAX, sys_arbiter))
-                .unwrap();
-
-            // init background system arbiter
-            let sys_ctrl = SystemController::new(sys_rx, stop_tx);
-            tokio_uring::spawn(sys_ctrl);
-
-            let res = fut.await;
-            drop(stop_rx);
-            res
-        })
-    }
-}*/
 
 #[derive(Debug)]
 pub(crate) enum SystemCommand {

actix-rt/tests/tests.rs

@@ -337,9 +337,8 @@ fn new_arbiter_with_tokio() {
 
     let _ = System::new();
 
-    let arb = Arbiter::with_tokio_rt(|| {
+    let arb =
-        tokio_uring::Runtime::new(&tokio_uring::builder()).unwrap()
+        Arbiter::with_tokio_rt(|| tokio_uring::Runtime::new(&tokio_uring::builder()).unwrap());
-    });
 
     let counter = Arc::new(AtomicBool::new(true));
 

actix-server/src/worker.rs

@@ -391,7 +391,8 @@ impl ServerWorker {
                         {
                             // passing `max_blocking_threads` as submission queue & completion queue
                             // should be useful than let it sit here
-                            let queue_size = config.max_blocking_threads.clamp(1, u32::MAX as usize) as u32;
+                            let queue_size =
+                                config.max_blocking_threads.clamp(1, u32::MAX as usize) as u32;
                             let mut builder = tokio_uring::builder();
                             builder.entries(queue_size);
                             builder.start(worker_fut);