Replace async-oneshot crate (#255)

ntex-rt/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.11] - 2023-11-22
+
+* Replace async-oneshot with oneshot
+
 ## [0.4.10] - 2023-11-02
 
 * Upgrade async-channel to 2.0

ntex-rt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-rt"
-version = "0.4.10"
+version = "0.4.11"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntex runtime"
 keywords = ["network", "framework", "async", "futures"]
@@ -28,10 +28,10 @@ tokio = ["tok-io"]
 async-std = ["async_std/unstable"]
 
 [dependencies]
-async-oneshot = "0.5"
 async-channel = "2.0"
 futures-core = "0.3"
 log = "0.4"
+oneshot = "0.1"
 
 tok-io = { version = "1", package = "tokio", default-features = false, features = [
     "rt",

ntex-rt/src/arbiter.rs

@@ -4,7 +4,6 @@ use std::task::{Context, Poll};
 use std::{cell::RefCell, collections::HashMap, fmt, future::Future, pin::Pin, thread};
 
 use async_channel::{unbounded, Receiver, Sender};
-use async_oneshot as oneshot;
 use futures_core::stream::Stream;
 
 use crate::system::System;
@@ -97,7 +96,7 @@ impl Arbiter {
             .spawn(move || {
                 let arb = Arbiter::with_sender(arb_tx);
 
-                let (stop, stop_rx) = oneshot::oneshot();
+                let (stop, stop_rx) = oneshot::channel();
                 STORAGE.with(|cell| cell.borrow_mut().clear());
 
                 System::set_current(sys);
@@ -147,18 +146,16 @@ impl Arbiter {
     /// Send a function to the Arbiter's thread. This function will be executed asynchronously.
     /// A future is created, and when resolved will contain the result of the function sent
     /// to the Arbiters thread.
-    pub fn exec<F, R>(&self, f: F) -> impl Future<Output = Result<R, oneshot::Closed>>
+    pub fn exec<F, R>(&self, f: F) -> impl Future<Output = Result<R, oneshot::RecvError>>
     where
         F: FnOnce() -> R + Send + 'static,
         R: Sync + Send + 'static,
     {
-        let (mut tx, rx) = oneshot::oneshot();
+        let (tx, rx) = oneshot::channel();
         let _ = self
             .sender
             .try_send(ArbiterCommand::ExecuteFn(Box::new(move || {
-                if !tx.is_closed() {
-                    let _ = tx.send(f());
-                }
+                let _ = tx.send(f());
             })));
         rx
     }
@@ -265,7 +262,7 @@ impl Future for ArbiterController {
                 Poll::Ready(None) => return Poll::Ready(()),
                 Poll::Ready(Some(item)) => match item {
                     ArbiterCommand::Stop => {
-                        if let Some(mut stop) = self.stop.take() {
+                        if let Some(stop) = self.stop.take() {
                             let _ = stop.send(0);
                         };
                         return Poll::Ready(());
@@ -331,7 +328,7 @@ impl Future for SystemArbiter {
                             arb.stop();
                         }
                         // stop event loop
-                        if let Some(mut stop) = self.stop.take() {
+                        if let Some(stop) = self.stop.take() {
                             let _ = stop.send(code);
                         }
                     }

ntex-rt/src/builder.rs

@@ -1,7 +1,6 @@
 use std::{cell::RefCell, future::Future, io, rc::Rc};
 
 use async_channel::unbounded;
-use async_oneshot as oneshot;
 
 use crate::arbiter::{Arbiter, ArbiterController, SystemArbiter};
 use crate::System;
@@ -45,7 +44,7 @@ impl Builder {
     ///
     /// This method panics if it can not create tokio runtime
     pub fn finish(self) -> SystemRunner {
-        let (stop_tx, stop) = oneshot::oneshot();
+        let (stop_tx, stop) = oneshot::channel();
         let (sys_sender, sys_receiver) = unbounded();
         let stop_on_panic = self.stop_on_panic;