summaryrefslogtreecommitdiff
path: root/helix-lsp/src/lib.rs
diff options
context:
space:
mode:
authorEgor Karavaev2021-06-03 16:48:59 +0000
committerBlaž Hrastnik2021-06-04 00:25:30 +0000
commitd55419604c7fa3d3b0559cf985760170a3866d87 (patch)
treedce6b7e845ee6e732d7f48577067317020dfcf9c /helix-lsp/src/lib.rs
parent29b9eed33c07c99fb9345a6832d3431157981e52 (diff)
Remove select_all implementation
Diffstat (limited to 'helix-lsp/src/lib.rs')
-rw-r--r--helix-lsp/src/lib.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 0a83c93a..eeb2cdbb 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -1,5 +1,4 @@
mod client;
-mod select_all;
mod transport;
pub use jsonrpc_core as jsonrpc;
@@ -171,7 +170,7 @@ pub use jsonrpc::Call;
type LanguageId = String;
-use crate::select_all::SelectAll;
+use futures_util::stream::select_all::SelectAll;
pub struct Registry {
inner: HashMap<LanguageId, Option<Arc<Client>>>,
@@ -198,7 +197,7 @@ impl Registry {
if let Some(config) = &language_config.language_server {
// avoid borrow issues
let inner = &mut self.inner;
- let s_incoming = &self.incoming;
+ let s_incoming = &mut self.incoming;
let language_server = inner
.entry(language_config.scope.clone()) // can't use entry with Borrow keys: https://github.com/rust-lang/rfcs/pull/1769