Merge pull request #435 from uklotzde/futures

Break up futures dependencies

Author: orottier

Cargo.toml

@@ -28,7 +28,11 @@ crossbeam-channel = "0.5"
 cubeb = { version = "0.10", optional = true }
 dasp_sample = "0.11"
 float_eq = "1.0"
-futures = { version = "0.3.29", default-features = false, features = ["std"] }
+futures-channel = { version = "0.3.30", features = ["sink"] }
+futures-core = { version = "0.3.30", default-features = false }
+futures-util = { version = "0.3.30", default-features = false, features = [
+    "sink",
+] }
 hound = "3.5"
 hrtf = "0.8.1"
 llq = "0.1.1"
@@ -44,7 +48,7 @@ vecmath = "1.0"
 no_denormals = "0.1.2"
 
 [dev-dependencies]
-futures = { version = "0.3.29", features = ["executor"] }
+futures = { version = "0.3.30", features = ["executor"] }
 alloc_counter = "0.0.4"
 criterion = "0.5.1"
 env_logger = "0.10"

src/context/offline.rs

@@ -8,8 +8,8 @@ use crate::context::{AudioContextState, BaseAudioContext, ConcreteBaseAudioConte
 use crate::render::RenderThread;
 use crate::{assert_valid_sample_rate, RENDER_QUANTUM_SIZE};
 
-use futures::channel::oneshot;
-use futures::sink::SinkExt;
+use futures_channel::{mpsc, oneshot};
+use futures_util::SinkExt as _;
 
 pub(crate) type OfflineAudioContextCallback =
     dyn FnOnce(&mut OfflineAudioContext) + Send + Sync + 'static;
@@ -26,7 +26,7 @@ pub struct OfflineAudioContext {
     /// actual renderer of the audio graph, can only be called once
     renderer: Mutex<Option<OfflineAudioContextRenderer>>,
     /// channel to notify resume actions on the rendering
-    resume_sender: futures::channel::mpsc::Sender<()>,
+    resume_sender: mpsc::Sender<()>,
 }
 
 struct OfflineAudioContextRenderer {
@@ -37,7 +37,7 @@ struct OfflineAudioContextRenderer {
     /// sorted list of callbacks to run at certain render quanta (via `suspend_sync`)
     suspend_callbacks: Vec<(usize, Box<OfflineAudioContextCallback>)>,
     /// channel to listen for `resume` calls on a suspended context
-    resume_receiver: futures::channel::mpsc::Receiver<()>,
+    resume_receiver: mpsc::Receiver<()>,
 }
 
 impl BaseAudioContext for OfflineAudioContext {
@@ -95,7 +95,7 @@ impl OfflineAudioContext {
             node_id_consumer,
         );
 
-        let (resume_sender, resume_receiver) = futures::channel::mpsc::channel(0);
+        let (resume_sender, resume_receiver) = mpsc::channel(0);
 
         let renderer = OfflineAudioContextRenderer {
             renderer,
@@ -221,7 +221,7 @@ impl OfflineAudioContext {
     ///
     /// ```rust
     /// use futures::{executor, join};
-    /// use futures::future::FutureExt;
+    /// use futures::FutureExt as _;
     /// use std::sync::Arc;
     ///
     /// use web_audio_api::context::BaseAudioContext;
@@ -423,8 +423,8 @@ mod tests {
     #[test]
     fn render_suspend_resume_async() {
         use futures::executor;
-        use futures::future::FutureExt;
         use futures::join;
+        use futures::FutureExt as _;
 
         let context = Arc::new(OfflineAudioContext::new(1, 512, 44_100.));
         let context_clone = Arc::clone(&context);

src/context/online.rs

@@ -13,7 +13,7 @@ use crate::render::graph::Graph;
 use crate::MediaElement;
 use crate::{AudioRenderCapacity, Event};
 
-use futures::channel::oneshot;
+use futures_channel::oneshot;
 
 /// Check if the provided sink_id is available for playback
 ///

src/message.rs

@@ -71,7 +71,7 @@ pub(crate) enum OneshotNotify {
     /// A synchronous oneshot sender
     Sync(crossbeam_channel::Sender<()>),
     /// An asynchronous oneshot sender
-    Async(futures::channel::oneshot::Sender<()>),
+    Async(futures_channel::oneshot::Sender<()>),
 }
 
 impl OneshotNotify {

src/render/thread.rs

@@ -9,8 +9,8 @@ use std::time::{Duration, Instant};
 
 use crossbeam_channel::{Receiver, Sender};
 use dasp_sample::FromSample;
-use futures::channel;
-use futures::stream::StreamExt;
+use futures_channel::{mpsc, oneshot};
+use futures_util::StreamExt as _;
 
 use super::AudioRenderQuantum;
 use crate::buffer::{AudioBuffer, AudioBufferOptions};
@@ -250,8 +250,8 @@ impl RenderThread {
     pub async fn render_audiobuffer(
         mut self,
         length: usize,
-        mut suspend_callbacks: Vec<(usize, channel::oneshot::Sender<()>)>,
-        mut resume_receiver: channel::mpsc::Receiver<()>,
+        mut suspend_callbacks: Vec<(usize, oneshot::Sender<()>)>,
+        mut resume_receiver: mpsc::Receiver<()>,
     ) -> AudioBuffer {
         let options = AudioBufferOptions {
             number_of_channels: self.number_of_channels,