deps: Switch rt crates to use futures-* crates individually

… except rt-compio, which publically re-exports futures.

Author: svix-jplatte

Cargo.toml

@@ -23,6 +23,7 @@ chrono             = { version = "0.4" }
 clap               = { version = "4.1.11", features = ["derive", "env"] }
 derive_more        = { version = "2.1.1", features = ["std", "from", "try_into", "display"] }
 futures            = { version = "0.3" }
+futures-channel    = { version = "0.3" }
 futures-util       = { version = "0.3" }
 lazy_static        = { version = "1.4.0" }
 maplit             = { version = "1.0.2" }

rt-monoio/Cargo.toml

@@ -17,8 +17,8 @@ repository = "https://github.com/databendlabs/openraft"
 [dependencies]
 openraft-rt = { path = "../rt", version = "0.10.0", features = ["single-threaded"] }
 
-futures    = { version = "0.3" }
-local-sync = { version = "0.1.1" }
-monoio     = { version = "0.2.3" }
-rand       = { version = "0.9" }
-tokio      = { version = "1.22", features = ["sync"] }
+futures-util = { version = "0.3" }
+local-sync   = { version = "0.1.1" }
+monoio       = { version = "0.2.3" }
+rand         = { version = "0.9" }
+tokio        = { version = "1.22", features = ["sync"] }

rt-monoio/src/mpsc.rs

@@ -4,7 +4,7 @@
 
 use std::future::Future;
 
-use futures::TryFutureExt;
+use futures_util::TryFutureExt;
 use openraft_rt::Mpsc;
 use openraft_rt::MpscReceiver;
 use openraft_rt::MpscSender;

rt-tokio/Cargo.toml

@@ -13,10 +13,10 @@ readme = "README.md"
 description = "Tokio runtime implementation for Openraft"
 
 [dependencies]
-openraft-rt = { path = "../rt", version = "0.10.0" }
-tokio = { version = "1.39", default-features = false, features = ["rt", "rt-multi-thread", "sync", "time"] }
-futures = { version = "0.3" }
-rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
+openraft-rt  = { path = "../rt", version = "0.10.0" }
+tokio        = { version = "1.39", default-features = false, features = ["rt", "rt-multi-thread", "sync", "time"] }
+futures-util = { version = "0.3" }
+rand         = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
 
 [features]
 default = []

rt-tokio/src/mpsc.rs

@@ -1,6 +1,6 @@
 use std::future::Future;
 
-use futures::TryFutureExt;
+use futures_util::TryFutureExt;
 use openraft_rt::Mpsc;
 use openraft_rt::MpscReceiver;
 use openraft_rt::MpscSender;

rt/Cargo.toml

@@ -18,6 +18,7 @@ default = []
 single-threaded = ["openraft-macros/single-threaded"]
 
 [dependencies]
-futures         = { workspace = true }
+futures-channel = { workspace = true }
+futures-util    = { workspace = true }
 openraft-macros = { version = "0.10", path = "../macros" }
 rand            = { workspace = true }

rt/src/async_runtime.rs

@@ -148,7 +148,7 @@ pub trait AsyncRuntime: Debug + OptionalSend + OptionalSync + 'static {
         F: FnOnce() -> T + Send + 'static,
         T: Send + 'static,
     {
-        let (tx, rx) = futures::channel::oneshot::channel();
+        let (tx, rx) = futures_channel::oneshot::channel();
         std::thread::spawn(move || {
             tx.send(f()).ok();
         });

rt/src/lib.rs

@@ -56,7 +56,7 @@ mod threaded {
     use std::future::Future;
     use std::pin::Pin;
 
-    use futures::Stream;
+    use futures_util::Stream;
 
     /// A trait that is empty if the `single-threaded` feature flag is enabled,
     /// otherwise it extends `Send`.
@@ -90,7 +90,7 @@ mod threaded {
     use std::future::Future;
     use std::pin::Pin;
 
-    use futures::Stream;
+    use futures_util::Stream;
 
     /// A trait that is empty if the `single-threaded` feature flag is enabled,
     /// otherwise it extends `Send`.

rt/src/testing.rs

@@ -1022,8 +1022,8 @@ impl<Rt: AsyncRuntime> Suite<Rt> {
 
 /// Polls the future and returns its current state.
 fn poll_in_place<F: Future>(fut: Pin<&mut F>) -> Poll<F::Output> {
-    let waker = futures::task::noop_waker();
-    let mut cx = futures::task::Context::from_waker(&waker);
+    let waker = futures_util::task::noop_waker();
+    let mut cx = futures_util::task::Context::from_waker(&waker);
     fut.poll(&mut cx)
 }