diff options
author | Blaž Hrastnik | 2021-05-06 05:33:53 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2021-05-06 05:33:53 +0000 |
commit | 1ad0581ddd2d1fc6eb8b96b495eb4e546d4bdd28 (patch) | |
tree | 94a707fb924c70b86905752c00f9dcbe97f73f08 /helix-term/src | |
parent | 355ad3cb8289611b06cd42fa62ddfe0a5c716e83 (diff) |
Eliminate a few more futures dependencies.
Diffstat (limited to 'helix-term/src')
-rw-r--r-- | helix-term/src/application.rs | 12 |
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) } } |