git.iko.soy/helix
on master help sign in
Bump deps, eliminate a lot of transitive deps.
e282fc7Blaž Hrastnik
Cargo.lock+33−149
compare with master
unifiedsplit
@@ -53,9 +53,9 @@ dependencies = [
53
53
54[[package]]
54[[package]]
55name = "async-channel"
55name = "async-channel"
56−version = "1.4.1"
56+version = "1.4.2"
57source = "registry+https://github.com/rust-lang/crates.io-index"
57source = "registry+https://github.com/rust-lang/crates.io-index"
58−checksum = "59386c3aa61f4e14c4ddda1a6744c119b4bf278ec9f866d3c20bc5728ee0eb97"
58+checksum = "21279cfaa4f47df10b1816007e738ca3747ef2ee53ffc51cdbf57a8bb266fee3"
59dependencies = [
59dependencies = [
60 "concurrent-queue",
60 "concurrent-queue",
61 "event-listener",
61 "event-listener",
@@ -64,9 +64,9 @@ dependencies = [
64
64
65[[package]]
65[[package]]
66name = "async-executor"
66name = "async-executor"
67−version = "0.2.1"
67+version = "1.0.0"
68source = "registry+https://github.com/rust-lang/crates.io-index"
68source = "registry+https://github.com/rust-lang/crates.io-index"
69−checksum = "29a9fcb167455a47928782aac31ee2752481385d305d613458db7bd4cc7ba0b4"
69+checksum = "62f049075ec7a47ee59ed2e3013026e26e66b7430b1f2276c1e6ad9d5cfbff8f"
70dependencies = [
70dependencies = [
71 "async-task",
71 "async-task",
72 "concurrent-queue",
72 "concurrent-queue",
@@ -77,9 +77,9 @@ dependencies = [
77
77
78[[package]]
78[[package]]
79name = "async-fs"
79name = "async-fs"
80−version = "1.1.2"
80+version = "1.2.1"
81source = "registry+https://github.com/rust-lang/crates.io-index"
81source = "registry+https://github.com/rust-lang/crates.io-index"
82−checksum = "4dffe45cf37df0df9439827c77ee4a39b95f26a0121fb615f989471c283ea6f7"
82+checksum = "3361d088d288026af2cb21b9d9b8444bf0ba73bce56a4fc4b5742ba88f82ee74"
83dependencies = [
83dependencies = [
84 "blocking",
84 "blocking",
85 "futures-lite",
85 "futures-lite",
@@ -87,9 +87,9 @@ dependencies = [
87
87
88[[package]]
88[[package]]
89name = "async-io"
89name = "async-io"
90−version = "0.2.7"
90+version = "1.0.1"
91source = "registry+https://github.com/rust-lang/crates.io-index"
91source = "registry+https://github.com/rust-lang/crates.io-index"
92−checksum = "c9424bb88867b003ca32a1d99cf64595c5a310c7322891795f38aa061860d0af"
92+checksum = "016a7f0eda7091ef24ad8562d6503ad8da47af8c432d4d3fa440eea9e89055fe"
93dependencies = [
93dependencies = [
94 "cfg-if",
94 "cfg-if",
95 "concurrent-queue",
95 "concurrent-queue",
@@ -109,9 +109,9 @@ dependencies = [
109
109
110[[package]]
110[[package]]
111name = "async-lock"
111name = "async-lock"
112−version = "2.1.1"
112+version = "2.1.2"
113source = "registry+https://github.com/rust-lang/crates.io-index"
113source = "registry+https://github.com/rust-lang/crates.io-index"
114−checksum = "cd7ffacc3ef2d598b07148706964f7a9b256926d5f9531c35126e8b8bb417ac5"
114+checksum = "2b123db9bf64e4c4840d5b1985fdb4f69fbe50a4fc95e895d11ff49931ce9802"
115dependencies = [
115dependencies = [
116 "async-barrier",
116 "async-barrier",
117 "async-mutex",
117 "async-mutex",
@@ -121,18 +121,18 @@ dependencies = [
121
121
122[[package]]
122[[package]]
123name = "async-mutex"
123name = "async-mutex"
124−version = "1.2.0"
124+version = "1.3.0"
125source = "registry+https://github.com/rust-lang/crates.io-index"
125source = "registry+https://github.com/rust-lang/crates.io-index"
126−checksum = "065de1ccf10280d0d75c2f3a71a970ee1007c85c51aa3e7deee1df100f1dfadb"
126+checksum = "66941c2577c4fa351e4ce5fdde8f86c69b88d623f3b955be1bc7362a23434632"
127dependencies = [
127dependencies = [
128 "event-listener",
128 "event-listener",
129]
129]
130
130
131[[package]]
131[[package]]
132name = "async-net"
132name = "async-net"
133−version = "1.0.0"
133+version = "1.2.0"
134source = "registry+https://github.com/rust-lang/crates.io-index"
134source = "registry+https://github.com/rust-lang/crates.io-index"
135−checksum = "79db11f7831e0de63763ed8e3f23c2095aad16c6ca2fffa727b922a955f026b2"
135+checksum = "f9c1d358c27ba114eab4330c50d21879ad0e6af192f01dba6fec1ab3b1e03d90"
136dependencies = [
136dependencies = [
137 "async-io",
137 "async-io",
138 "blocking",
138 "blocking",
@@ -141,9 +141,9 @@ dependencies = [
141
141
142[[package]]
142[[package]]
143name = "async-process"
143name = "async-process"
144−version = "0.1.3"
144+version = "1.0.0"
145source = "registry+https://github.com/rust-lang/crates.io-index"
145source = "registry+https://github.com/rust-lang/crates.io-index"
146−checksum = "23d510baf319291a41e6c3363df4408a3b196ad18fcb1305ae4e500f2eabe260"
146+checksum = "0bb915df28b8309139bd9c9c700d84c20e5c21385d05378caa84912332d0f6a1"
147dependencies = [
147dependencies = [
148 "async-io",
148 "async-io",
149 "blocking",
149 "blocking",
@@ -167,9 +167,9 @@ dependencies = [
167
167
168[[package]]
168[[package]]
169name = "async-semaphore"
169name = "async-semaphore"
170−version = "1.0.0"
170+version = "1.1.0"
171source = "registry+https://github.com/rust-lang/crates.io-index"
171source = "registry+https://github.com/rust-lang/crates.io-index"
172−checksum = "64fa45fce1280cc450781869a9edec7986cdefb971d3e1607798b5e52bad068a"
172+checksum = "66d2be5973230861689460806b8db059bbd8bcb507cabaa71646ae89f5b2f2ee"
173dependencies = [
173dependencies = [
174 "event-listener",
174 "event-listener",
175]
175]
@@ -194,9 +194,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
194
194
195[[package]]
195[[package]]
196name = "blocking"
196name = "blocking"
197−version = "0.6.1"
197+version = "1.0.0"
198source = "registry+https://github.com/rust-lang/crates.io-index"
198source = "registry+https://github.com/rust-lang/crates.io-index"
199−checksum = "3f30e08a950487f80d2de5cbb72772c8bbaed6002dc8d979722dabd034ede18d"
199+checksum = "2640778f8053e72c11f621b0a5175a0560a269282aa98ed85107773ab8e2a556"
200dependencies = [
200dependencies = [
201 "async-channel",
201 "async-channel",
202 "atomic-waker",
202 "atomic-waker",
@@ -250,13 +250,13 @@ dependencies = [
250
250
251[[package]]
251[[package]]
252name = "crossterm"
252name = "crossterm"
253−version = "0.17.7"
253+version = "0.17.8"
254source = "registry+https://github.com/rust-lang/crates.io-index"
254source = "registry+https://github.com/rust-lang/crates.io-index"
255−checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7"
255+checksum = "858085e389f71d31a6909f2b55a56b87d1cb8b168c0f513dcbed5e66a3e1039c"
256dependencies = [
256dependencies = [
257 "bitflags",
257 "bitflags",
258 "crossterm_winapi",
258 "crossterm_winapi",
259− "futures-util",
259+ "futures-core",
260 "lazy_static",
260 "lazy_static",
261 "libc",
261 "libc",
262 "mio",
262 "mio",
@@ -296,30 +296,6 @@ dependencies = [
296 "new_debug_unreachable",
296 "new_debug_unreachable",
297]
297]
298
298
299−[[package]]
300−name = "futures"
301−version = "0.3.5"
302−source = "registry+https://github.com/rust-lang/crates.io-index"
303−checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
304−dependencies = [
305− "futures-channel",
306− "futures-core",
307− "futures-io",
308− "futures-sink",
309− "futures-task",
310− "futures-util",
311−]
312−
313−[[package]]
314−name = "futures-channel"
315−version = "0.3.5"
316−source = "registry+https://github.com/rust-lang/crates.io-index"
317−checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
318−dependencies = [
319− "futures-core",
320− "futures-sink",
321−]
322−
323[[package]]
299[[package]]
324name = "futures-core"
300name = "futures-core"
325version = "0.3.5"
301version = "0.3.5"
@@ -334,9 +310,9 @@ checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
334
310
335[[package]]
311[[package]]
336name = "futures-lite"
312name = "futures-lite"
337−version = "1.0.0"
313+version = "1.3.0"
338source = "registry+https://github.com/rust-lang/crates.io-index"
314source = "registry+https://github.com/rust-lang/crates.io-index"
339−checksum = "5dfd8ccee4974dccf68838bb2b9c90439238090061c82454af83866ac059eb9f"
315+checksum = "4fc6854fcb40c6446abf6043e82604e42567dcf3d652a5ff4e997fc36876414c"
340dependencies = [
316dependencies = [
341 "fastrand",
317 "fastrand",
342 "futures-core",
318 "futures-core",
@@ -347,53 +323,6 @@ dependencies = [
347 "waker-fn",
323 "waker-fn",
348]
324]
349
325
350−[[package]]
351−name = "futures-macro"
352−version = "0.3.5"
353−source = "registry+https://github.com/rust-lang/crates.io-index"
354−checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
355−dependencies = [
356− "proc-macro-hack",
357− "proc-macro2",
358− "quote",
359− "syn",
360−]
361−
362−[[package]]
363−name = "futures-sink"
364−version = "0.3.5"
365−source = "registry+https://github.com/rust-lang/crates.io-index"
366−checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
367−
368−[[package]]
369−name = "futures-task"
370−version = "0.3.5"
371−source = "registry+https://github.com/rust-lang/crates.io-index"
372−checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
373−dependencies = [
374− "once_cell",
375−]
376−
377−[[package]]
378−name = "futures-util"
379−version = "0.3.5"
380−source = "registry+https://github.com/rust-lang/crates.io-index"
381−checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
382−dependencies = [
383− "futures-channel",
384− "futures-core",
385− "futures-io",
386− "futures-macro",
387− "futures-sink",
388− "futures-task",
389− "memchr",
390− "pin-project",
391− "pin-utils",
392− "proc-macro-hack",
393− "proc-macro-nested",
394− "slab",
395−]
396−
397[[package]]
326[[package]]
398name = "heck"
327name = "heck"
399version = "0.3.1"
328version = "0.3.1"
@@ -422,7 +351,6 @@ dependencies = [
422 "anyhow",
351 "anyhow",
423 "argh",
352 "argh",
424 "crossterm",
353 "crossterm",
425− "futures",
426 "helix-core",
354 "helix-core",
427 "num_cpus",
355 "num_cpus",
428 "smol",
356 "smol",
@@ -565,43 +493,17 @@ dependencies = [
565 "winapi",
493 "winapi",
566]
494]
567
495
568−[[package]]
569−name = "pin-project"
570−version = "0.4.23"
571−source = "registry+https://github.com/rust-lang/crates.io-index"
572−checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
573−dependencies = [
574− "pin-project-internal",
575−]
576−
577−[[package]]
578−name = "pin-project-internal"
579−version = "0.4.23"
580−source = "registry+https://github.com/rust-lang/crates.io-index"
581−checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
582−dependencies = [
583− "proc-macro2",
584− "quote",
585− "syn",
586−]
587−
588[[package]]
496[[package]]
589name = "pin-project-lite"
497name = "pin-project-lite"
590version = "0.1.7"
498version = "0.1.7"
591source = "registry+https://github.com/rust-lang/crates.io-index"
499source = "registry+https://github.com/rust-lang/crates.io-index"
592checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
500checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
593
501
594−[[package]]
595−name = "pin-utils"
596−version = "0.1.0"
597−source = "registry+https://github.com/rust-lang/crates.io-index"
598−checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
599−
600[[package]]
502[[package]]
601name = "polling"
503name = "polling"
602−version = "0.1.8"
504+version = "1.0.1"
603source = "registry+https://github.com/rust-lang/crates.io-index"
505source = "registry+https://github.com/rust-lang/crates.io-index"
604−checksum = "b1e9fa0ab21ed700cf0c4ebec57ae5496bec942a0aef9545562979a9f75b97aa"
506+checksum = "0835fa5f9af34c170eb38638ae6bc88e1b11ecdd0b968c9d9de8e343450385eb"
605dependencies = [
507dependencies = [
606 "cfg-if",
508 "cfg-if",
607 "libc",
509 "libc",
@@ -610,18 +512,6 @@ dependencies = [
610 "winapi",
512 "winapi",
611]
513]
612
514
613−[[package]]
614−name = "proc-macro-hack"
615−version = "0.5.18"
616−source = "registry+https://github.com/rust-lang/crates.io-index"
617−checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
618−
619−[[package]]
620−name = "proc-macro-nested"
621−version = "0.1.6"
622−source = "registry+https://github.com/rust-lang/crates.io-index"
623−checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
624−
625[[package]]
515[[package]]
626name = "proc-macro2"
516name = "proc-macro2"
627version = "1.0.20"
517version = "1.0.20"
@@ -682,12 +572,6 @@ dependencies = [
682 "libc",
572 "libc",
683]
573]
684
574
685−[[package]]
686−name = "slab"
687−version = "0.4.2"
688−source = "registry+https://github.com/rust-lang/crates.io-index"
689−checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
690−
691[[package]]
575[[package]]
692name = "smallvec"
576name = "smallvec"
693version = "1.4.2"
577version = "1.4.2"
@@ -696,9 +580,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
696
580
697[[package]]
581[[package]]
698name = "smol"
582name = "smol"
699−version = "0.4.3"
583+version = "1.0.0"
700source = "registry+https://github.com/rust-lang/crates.io-index"
584source = "registry+https://github.com/rust-lang/crates.io-index"
701−checksum = "0714120d45176fe0b7763527a28c32af32389eb5c07e28142766080839c491ed"
585+checksum = "1ee895b9f862d88d6bad9d82f6ce727710d177338e697057a691ea684800d4a6"
702dependencies = [
586dependencies = [
703 "async-channel",
587 "async-channel",
704 "async-executor",
588 "async-executor",
@@ -726,9 +610,9 @@ dependencies = [
726
610
727[[package]]
611[[package]]
728name = "syn"
612name = "syn"
729−version = "1.0.39"
613+version = "1.0.40"
730source = "registry+https://github.com/rust-lang/crates.io-index"
614source = "registry+https://github.com/rust-lang/crates.io-index"
731−checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
615+checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
732dependencies = [
616dependencies = [
733 "proc-macro2",
617 "proc-macro2",
734 "quote",
618 "quote",
@@ -784,9 +668,9 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
784
668
785[[package]]
669[[package]]
786name = "vec-arena"
670name = "vec-arena"
787−version = "0.5.2"
671+version = "1.0.0"
788source = "registry+https://github.com/rust-lang/crates.io-index"
672source = "registry+https://github.com/rust-lang/crates.io-index"
789−checksum = "8cb18268690309760d59ee1a9b21132c126ba384f374c59a94db4bc03adeb561"
673+checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
790
674
791[[package]]
675[[package]]
792name = "waker-fn"
676name = "waker-fn"
helix-term/Cargo.toml+3−5
@@ -14,13 +14,11 @@ path = "src/main.rs"
14# termwiz = { git = "https://github.com/wez/wezterm", features = ["widgets"] }
14# termwiz = { git = "https://github.com/wez/wezterm", features = ["widgets"] }
15# termwiz = { path = "../../wezterm/termwiz", default-features = false, features = ["widgets"] }
15# termwiz = { path = "../../wezterm/termwiz", default-features = false, features = ["widgets"] }
16
16
17−anyhow = "1.0.31"
17+anyhow = "1"
18argh = "0.1.3"
18argh = "0.1.3"
19helix-core = { path = "../helix-core" }
19helix-core = { path = "../helix-core" }
20−crossterm = { version = "0.17.7", features = ["event-stream"] }
20+crossterm = { version = "0.17", features = ["event-stream"] }
21
21
22−smol = "0.4"
22+smol = "1"
23−futures = { version = "0.3.5", default-features = false, features = ["std", "async-await"] }
24num_cpus = "1.13.0"
23num_cpus = "1.13.0"
25tui = { version = "0.10.0", default-features = false, features = ["crossterm"] }
24tui = { version = "0.10.0", default-features = false, features = ["crossterm"] }
26−# futures-timer = "3.0.2"
helix-term/src/editor.rs+2−1
@@ -8,8 +8,9 @@ use crossterm::{
8 style::{Color, Print, SetForegroundColor},
8 style::{Color, Print, SetForegroundColor},
9 terminal::{self, disable_raw_mode, enable_raw_mode},
9 terminal::{self, disable_raw_mode, enable_raw_mode},
10};
10};
11−use futures::{future::FutureExt, select, StreamExt};
11+
12use helix_core::{state::coords_at_pos, state::Mode, State};
12use helix_core::{state::coords_at_pos, state::Mode, State};
13+use smol::prelude::*;
13use std::io::{self, stdout, Write};
14use std::io::{self, stdout, Write};
14use std::path::PathBuf;
15use std::path::PathBuf;
15use std::time::Duration;
16use std::time::Duration;