git.iko.soy/helix
on master help sign in
Eliminate a few more futures dependencies.
1ad0581Blaž Hrastnik
Cargo.lock+3−57
compare with master
unifiedsplit
@@ -185,54 +185,12 @@ dependencies = [
185 "new_debug_unreachable",
185 "new_debug_unreachable",
186]
186]
187
187
188−[[package]]
189−name = "futures"
190−version = "0.3.14"
191−source = "registry+https://github.com/rust-lang/crates.io-index"
192−checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
193−dependencies = [
194− "futures-channel",
195− "futures-core",
196− "futures-executor",
197− "futures-io",
198− "futures-sink",
199− "futures-task",
200− "futures-util",
201−]
202−
203−[[package]]
204−name = "futures-channel"
205−version = "0.3.14"
206−source = "registry+https://github.com/rust-lang/crates.io-index"
207−checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
208−dependencies = [
209− "futures-core",
210− "futures-sink",
211−]
212−
213[[package]]
188[[package]]
214name = "futures-core"
189name = "futures-core"
215version = "0.3.14"
190version = "0.3.14"
216source = "registry+https://github.com/rust-lang/crates.io-index"
191source = "registry+https://github.com/rust-lang/crates.io-index"
217checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
192checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
218
193
219−[[package]]
220−name = "futures-executor"
221−version = "0.3.14"
222−source = "registry+https://github.com/rust-lang/crates.io-index"
223−checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
224−dependencies = [
225− "futures-core",
226− "futures-task",
227− "futures-util",
228−]
229−
230−[[package]]
231−name = "futures-io"
232−version = "0.3.14"
233−source = "registry+https://github.com/rust-lang/crates.io-index"
234−checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
235−
236[[package]]
194[[package]]
237name = "futures-macro"
195name = "futures-macro"
238version = "0.3.14"
196version = "0.3.14"
@@ -245,12 +203,6 @@ dependencies = [
245 "syn",
203 "syn",
246]
204]
247
205
248−[[package]]
249−name = "futures-sink"
250−version = "0.3.14"
251−source = "registry+https://github.com/rust-lang/crates.io-index"
252−checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
253−
254[[package]]
206[[package]]
255name = "futures-task"
207name = "futures-task"
256version = "0.3.14"
208version = "0.3.14"
@@ -263,13 +215,9 @@ version = "0.3.14"
263source = "registry+https://github.com/rust-lang/crates.io-index"
215source = "registry+https://github.com/rust-lang/crates.io-index"
264checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
216checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
265dependencies = [
217dependencies = [
266− "futures-channel",
267 "futures-core",
218 "futures-core",
268− "futures-io",
269 "futures-macro",
219 "futures-macro",
270− "futures-sink",
271 "futures-task",
220 "futures-task",
272− "memchr",
273 "pin-project-lite",
221 "pin-project-lite",
274 "pin-utils",
222 "pin-utils",
275 "proc-macro-hack",
223 "proc-macro-hack",
@@ -405,7 +353,6 @@ version = "0.1.0"
405dependencies = [
353dependencies = [
406 "anyhow",
354 "anyhow",
407 "crossterm",
355 "crossterm",
408− "futures-util",
409 "helix-core",
356 "helix-core",
410 "helix-lsp",
357 "helix-lsp",
411 "once_cell",
358 "once_cell",
@@ -491,11 +438,10 @@ dependencies = [
491
438
492[[package]]
439[[package]]
493name = "jsonrpc-core"
440name = "jsonrpc-core"
494−version = "17.0.0"
441+version = "17.1.0"
495−source = "registry+https://github.com/rust-lang/crates.io-index"
442+source = "git+https://github.com/paritytech/jsonrpc#609d7a6cc160742d035510fa89fb424ccf077660"
496−checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f"
497dependencies = [
443dependencies = [
498− "futures",
444+ "futures-util",
499 "log",
445 "log",
500 "serde",
446 "serde",
501 "serde_derive",
447 "serde_derive",
helix-lsp/Cargo.toml+3−2
@@ -21,7 +21,8 @@ glob = "0.3"
21anyhow = "1"
21anyhow = "1"
22serde_json = "1.0"
22serde_json = "1.0"
23serde = { version = "1.0", features = ["derive"] }
23serde = { version = "1.0", features = ["derive"] }
24−jsonrpc-core = "17.0"
24+# jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
25+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", default-features = false } # don't pull in all of futures
25−futures-util = "0.3"
26+futures-util = { version = "0.3", features = ["std", "async-await"] }
26thiserror = "1.0"
27thiserror = "1.0"
27log = "~0.4"
28log = "~0.4"
helix-term/Cargo.toml+1−1
@@ -25,7 +25,7 @@ tui = { version = "0.15", default-features = false, features = ["crossterm"] }
25crossterm = { version = "0.19", features = ["event-stream"] }
25crossterm = { version = "0.19", features = ["event-stream"] }
26clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
26clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
27
27
28−futures-util = "0.3"
28+futures-util = { version = "0.3", features = ["std", "async-await"] }
29
29
30# Logging
30# Logging
31fern = "0.6"
31fern = "0.6"
helix-term/src/application.rs+6−6
@@ -23,7 +23,6 @@ use crossterm::{
23
23
24use tui::layout::Rect;
24use tui::layout::Rect;
25
25
26−// use futures_util::future::BoxFuture;
27use futures_util::stream::FuturesUnordered;
26use futures_util::stream::FuturesUnordered;
28use std::pin::Pin;
27use std::pin::Pin;
29
28
@@ -92,15 +91,16 @@ impl Application {
92 break;
91 break;
93 }
92 }
94
93
95− use futures_util::{select, FutureExt, StreamExt};
94+ use futures_util::StreamExt;
95+
96− select! {
96+ tokio::select! {
97− event = reader.next().fuse() => {
97+ event = reader.next() => {
98 self.handle_terminal_events(event)
98 self.handle_terminal_events(event)
99 }
99 }
100− call = futures_util::StreamExt::select_next_some(&mut self.editor.language_servers.incoming) => {
100+ Some(call) = self.editor.language_servers.incoming.next() => {
101 self.handle_language_server_message(call).await
101 self.handle_language_server_message(call).await
102 }
102 }
103− callback = futures_util::StreamExt::select_next_some(&mut self.callbacks) => {
103+ Some(callback) = &mut self.callbacks.next() => {
104 self.handle_language_server_callback(callback)
104 self.handle_language_server_callback(callback)
105 }
105 }
106 }
106 }
helix-view/Cargo.toml−1
@@ -22,7 +22,6 @@ once_cell = "1.4"
22url = "2"
22url = "2"
23
23
24tokio = { version = "1", features = ["full"] }
24tokio = { version = "1", features = ["full"] }
25−futures-util = "0.3"
26
25
27slotmap = "1"
26slotmap = "1"
28
27