aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src/application.rs
diff options
context:
space:
mode:
Diffstat (limited to 'helix-term/src/application.rs')
-rw-r--r--helix-term/src/application.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3bf746ea..9838998a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -23,7 +23,6 @@ use crossterm::{
use tui::layout::Rect;
-// use futures_util::future::BoxFuture;
use futures_util::stream::FuturesUnordered;
use std::pin::Pin;
@@ -92,15 +91,16 @@ impl Application {
break;
}
- use futures_util::{select, FutureExt, StreamExt};
- select! {
- event = reader.next().fuse() => {
+ use futures_util::StreamExt;
+
+ tokio::select! {
+ event = reader.next() => {
self.handle_terminal_events(event)
}
- call = futures_util::StreamExt::select_next_some(&mut self.editor.language_servers.incoming) => {
+ Some(call) = self.editor.language_servers.incoming.next() => {
self.handle_language_server_message(call).await
}
- callback = futures_util::StreamExt::select_next_some(&mut self.callbacks) => {
+ Some(callback) = &mut self.callbacks.next() => {
self.handle_language_server_callback(callback)
}
}