diff --git a/promkit-async/src/display_coordinator.rs b/promkit-async/src/display_coordinator.rs index b014f712..145f0807 100644 --- a/promkit-async/src/display_coordinator.rs +++ b/promkit-async/src/display_coordinator.rs @@ -7,7 +7,7 @@ use std::{ }; use crossterm::terminal; -use futures::{Future, FutureExt}; +use futures::Future; use futures_timer::Delay; use tokio::sync::mpsc::Receiver; @@ -69,11 +69,11 @@ impl DisplayCoordinator { async move { loop { - let delay = Delay::new(delay_duration).fuse(); + let delay = Delay::new(delay_duration); futures::pin_mut!(delay); - futures::select! { - maybe_tuple = loading_activation_receiver.recv().fuse() => { + tokio::select! { + maybe_tuple = loading_activation_receiver.recv() => { match maybe_tuple { Some((version, index)) => { if version > global.load(Ordering::SeqCst) { @@ -84,7 +84,7 @@ impl DisplayCoordinator { None => break, } }, - maybe_triplet = indexed_pane_receiver.recv().fuse() => { + maybe_triplet = indexed_pane_receiver.recv() => { match maybe_triplet { Some((version, index, pane)) => { if version >= global.load(Ordering::SeqCst) { diff --git a/promkit-async/src/event_buffer.rs b/promkit-async/src/event_buffer.rs index 07018979..203fd55d 100644 --- a/promkit-async/src/event_buffer.rs +++ b/promkit-async/src/event_buffer.rs @@ -1,7 +1,7 @@ use std::time::Duration; use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers}; -use futures::future::{Future, FutureExt}; +use futures::future::Future; use futures_timer::Delay; use tokio::sync::mpsc::{Receiver, Sender}; @@ -32,11 +32,11 @@ impl EventBuffer { async move { loop { - let delay = Delay::new(delay_duration).fuse(); + let delay = Delay::new(delay_duration); futures::pin_mut!(delay); - futures::select! { - maybe_event = event_receiver.recv().fuse() => { + tokio::select! { + maybe_event = event_receiver.recv() => { if let Some(event) = maybe_event { buffer.push(event); } else { diff --git a/promkit-async/src/lib.rs b/promkit-async/src/lib.rs index 8ae208f3..8a254c80 100644 --- a/promkit-async/src/lib.rs +++ b/promkit-async/src/lib.rs @@ -7,7 +7,7 @@ use std::{ time::Duration, }; -use futures::{future::FutureExt, stream::StreamExt, Future}; +use futures::{stream::StreamExt, Future}; use tokio::sync::mpsc::Receiver; @@ -99,8 +99,8 @@ impl Prompt { let version = Arc::new(AtomicUsize::new(1)); loop { - futures::select! { - maybe_event = stream.next().fuse() => { + tokio::select! { + maybe_event = stream.next() => { if let Some(Ok(event)) = maybe_event { match event { Event::Resize(width, height) => { @@ -112,18 +112,18 @@ impl Prompt { } } }, - maybe_debounced_resize = debounced_resize_receiver.recv().fuse() => { + maybe_debounced_resize = debounced_resize_receiver.recv() => { if let Some((width, height)) = maybe_debounced_resize { size = (width, height); } }, - maybe_event_buffer = event_buffer_receiver.recv().fuse() => { + maybe_event_buffer = event_buffer_receiver.recv() => { if let Some(event_buffer) = maybe_event_buffer { let next = version.fetch_add(1, Ordering::SeqCst); self.renderer.sync(next, &event_buffer, size.0, size.1).await?; } }, - maybe_fin = fin_receiver.recv().fuse() => { + maybe_fin = fin_receiver.recv() => { if maybe_fin.is_some() { break; } diff --git a/promkit-async/src/resize_debounce.rs b/promkit-async/src/resize_debounce.rs index e9c7f6b4..8c3c23cc 100644 --- a/promkit-async/src/resize_debounce.rs +++ b/promkit-async/src/resize_debounce.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use futures::future::{Future, FutureExt}; +use futures::future::Future; use futures_timer::Delay; use tokio::sync::mpsc::{Receiver, Sender}; @@ -23,11 +23,11 @@ impl ResizeDebounce { async move { let mut last_event: Option<(u16, u16)> = None; loop { - let delay = Delay::new(delay_duration).fuse(); + let delay = Delay::new(delay_duration); futures::pin_mut!(delay); - futures::select! { - resize_opt = resize_receiver.recv().fuse() => { + tokio::select! { + resize_opt = resize_receiver.recv() => { if let Some(event) = resize_opt { last_event = Some(event); } else {