git.iko.soy/helix
on master help sign in
Bump deps, make it compile with latest smol.
0d56ce9Blaž Hrastnik
Cargo.lock+131−66
compare with master
unifiedsplit
@@ -41,11 +41,21 @@ version = "0.1.1"
41source = "registry+https://github.com/rust-lang/crates.io-index"
41source = "registry+https://github.com/rust-lang/crates.io-index"
42checksum = "e1ba68f4276a778591e36a0c348a269888f3a177c8d2054969389e3b59611ff5"
42checksum = "e1ba68f4276a778591e36a0c348a269888f3a177c8d2054969389e3b59611ff5"
43
43
44+[[package]]
45+name = "async-barrier"
46+version = "1.0.1"
47+source = "registry+https://github.com/rust-lang/crates.io-index"
48+checksum = "c06293698675eb72e1155867e5982f199d6b6c230dca35bc5ffd9852f470c22a"
49+dependencies = [
50+ "async-mutex",
51+ "event-listener",
52+]
53+
44[[package]]
54[[package]]
45name = "async-channel"
55name = "async-channel"
46−version = "1.4.0"
56+version = "1.4.1"
47source = "registry+https://github.com/rust-lang/crates.io-index"
57source = "registry+https://github.com/rust-lang/crates.io-index"
48−checksum = "43de69555a39d52918e2bc33a408d3c0a86c829b212d898f4ca25d21a6387478"
58+checksum = "59386c3aa61f4e14c4ddda1a6744c119b4bf278ec9f866d3c20bc5728ee0eb97"
49dependencies = [
59dependencies = [
50 "concurrent-queue",
60 "concurrent-queue",
51 "event-listener",
61 "event-listener",
@@ -54,37 +64,116 @@ dependencies = [
54
64
55[[package]]
65[[package]]
56name = "async-executor"
66name = "async-executor"
57−version = "0.1.2"
67+version = "0.2.1"
58source = "registry+https://github.com/rust-lang/crates.io-index"
68source = "registry+https://github.com/rust-lang/crates.io-index"
59−checksum = "90f47c78ea98277cb1f5e6f60ba4fc762f5eafe9f6511bc2f7dfd8b75c225650"
69+checksum = "29a9fcb167455a47928782aac31ee2752481385d305d613458db7bd4cc7ba0b4"
60dependencies = [
70dependencies = [
61− "async-io",
71+ "async-task",
72+ "concurrent-queue",
73+ "fastrand",
74+ "futures-lite",
75+ "once_cell",
76+]
77+
78+[[package]]
79+name = "async-fs"
80+version = "1.1.2"
81+source = "registry+https://github.com/rust-lang/crates.io-index"
82+checksum = "4dffe45cf37df0df9439827c77ee4a39b95f26a0121fb615f989471c283ea6f7"
83+dependencies = [
84+ "blocking",
62 "futures-lite",
85 "futures-lite",
63− "multitask",
64− "parking 1.0.6",
65− "scoped-tls",
66− "waker-fn",
67]
86]
68
87
69[[package]]
88[[package]]
70name = "async-io"
89name = "async-io"
71−version = "0.1.11"
90+version = "0.2.7"
72source = "registry+https://github.com/rust-lang/crates.io-index"
91source = "registry+https://github.com/rust-lang/crates.io-index"
73−checksum = "3ae22a338d28c75b53702b66f77979062cb29675db376d99e451af4fa79dedb3"
92+checksum = "c9424bb88867b003ca32a1d99cf64595c5a310c7322891795f38aa061860d0af"
74dependencies = [
93dependencies = [
75 "cfg-if",
94 "cfg-if",
76 "concurrent-queue",
95 "concurrent-queue",
96+ "fastrand",
77 "futures-lite",
97 "futures-lite",
78 "libc",
98 "libc",
99+ "log",
79 "once_cell",
100 "once_cell",
80− "parking 2.0.0",
101+ "parking",
81 "polling",
102 "polling",
82 "socket2",
103 "socket2",
83 "vec-arena",
104 "vec-arena",
105+ "waker-fn",
84 "wepoll-sys-stjepang",
106 "wepoll-sys-stjepang",
85 "winapi",
107 "winapi",
86]
108]
87
109
110+[[package]]
111+name = "async-lock"
112+version = "2.1.1"
113+source = "registry+https://github.com/rust-lang/crates.io-index"
114+checksum = "cd7ffacc3ef2d598b07148706964f7a9b256926d5f9531c35126e8b8bb417ac5"
115+dependencies = [
116+ "async-barrier",
117+ "async-mutex",
118+ "async-rwlock",
119+ "async-semaphore",
120+]
121+
122+[[package]]
123+name = "async-mutex"
124+version = "1.2.0"
125+source = "registry+https://github.com/rust-lang/crates.io-index"
126+checksum = "065de1ccf10280d0d75c2f3a71a970ee1007c85c51aa3e7deee1df100f1dfadb"
127+dependencies = [
128+ "event-listener",
129+]
130+
131+[[package]]
132+name = "async-net"
133+version = "1.0.0"
134+source = "registry+https://github.com/rust-lang/crates.io-index"
135+checksum = "79db11f7831e0de63763ed8e3f23c2095aad16c6ca2fffa727b922a955f026b2"
136+dependencies = [
137+ "async-io",
138+ "blocking",
139+ "futures-lite",
140+]
141+
142+[[package]]
143+name = "async-process"
144+version = "0.1.3"
145+source = "registry+https://github.com/rust-lang/crates.io-index"
146+checksum = "23d510baf319291a41e6c3363df4408a3b196ad18fcb1305ae4e500f2eabe260"
147+dependencies = [
148+ "async-io",
149+ "blocking",
150+ "cfg-if",
151+ "event-listener",
152+ "futures-lite",
153+ "once_cell",
154+ "signal-hook",
155+ "winapi",
156+]
157+
158+[[package]]
159+name = "async-rwlock"
160+version = "1.1.0"
161+source = "registry+https://github.com/rust-lang/crates.io-index"
162+checksum = "6f8978b5ae008b5177da07a1bf1bfbe428f9bdb970c3fca0e92ed1c1930d7f34"
163+dependencies = [
164+ "async-mutex",
165+ "event-listener",
166+]
167+
168+[[package]]
169+name = "async-semaphore"
170+version = "1.0.0"
171+source = "registry+https://github.com/rust-lang/crates.io-index"
172+checksum = "64fa45fce1280cc450781869a9edec7986cdefb971d3e1607798b5e52bad068a"
173+dependencies = [
174+ "event-listener",
175+]
176+
88[[package]]
177[[package]]
89name = "async-task"
178name = "async-task"
90version = "3.0.0"
179version = "3.0.0"
@@ -105,12 +194,13 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
105
194
106[[package]]
195[[package]]
107name = "blocking"
196name = "blocking"
108−version = "0.5.2"
197+version = "0.6.1"
109source = "registry+https://github.com/rust-lang/crates.io-index"
198source = "registry+https://github.com/rust-lang/crates.io-index"
110−checksum = "ea5800d29218fea137b0880387e5948694a23c93fcdde157006966693a865c7c"
199+checksum = "3f30e08a950487f80d2de5cbb72772c8bbaed6002dc8d979722dabd034ede18d"
111dependencies = [
200dependencies = [
112 "async-channel",
201 "async-channel",
113 "atomic-waker",
202 "atomic-waker",
203+ "fastrand",
114 "futures-lite",
204 "futures-lite",
115 "once_cell",
205 "once_cell",
116 "waker-fn",
206 "waker-fn",
@@ -178,23 +268,17 @@ dependencies = [
178 "winapi",
268 "winapi",
179]
269]
180
270
181−[[package]]
182−name = "easy-parallel"
183−version = "3.1.0"
184−source = "registry+https://github.com/rust-lang/crates.io-index"
185−checksum = "1dd4afd79212583ff429b913ad6605242ed7eec277e950b1438f300748f948f4"
186−
187[[package]]
271[[package]]
188name = "event-listener"
272name = "event-listener"
189−version = "2.3.3"
273+version = "2.4.0"
190source = "registry+https://github.com/rust-lang/crates.io-index"
274source = "registry+https://github.com/rust-lang/crates.io-index"
191−checksum = "7f14646a9e0430150a87951622ba9675472b68e384b7701b8423b30560805c7a"
275+checksum = "e1cd41440ae7e4734bbd42302f63eaba892afc93a3912dad84006247f0dedb0e"
192
276
193[[package]]
277[[package]]
194name = "fastrand"
278name = "fastrand"
195−version = "1.3.4"
279+version = "1.3.5"
196source = "registry+https://github.com/rust-lang/crates.io-index"
280source = "registry+https://github.com/rust-lang/crates.io-index"
197−checksum = "4bd3bdaaf0a72155260a1c098989b60db1cbb22d6a628e64f16237aa4da93cc7"
281+checksum = "5c85295147490b8fcf2ea3d104080a105a8b2c63f9c319e82c02d8e952388919"
198
282
199[[package]]
283[[package]]
200name = "futf"
284name = "futf"
@@ -244,15 +328,15 @@ checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
244
328
245[[package]]
329[[package]]
246name = "futures-lite"
330name = "futures-lite"
247−version = "0.1.11"
331+version = "1.0.0"
248source = "registry+https://github.com/rust-lang/crates.io-index"
332source = "registry+https://github.com/rust-lang/crates.io-index"
249−checksum = "97999970129b808f0ccba93211201d431fcc12d7e1ffae03a61b5cedd1a7ced2"
333+checksum = "5dfd8ccee4974dccf68838bb2b9c90439238090061c82454af83866ac059eb9f"
250dependencies = [
334dependencies = [
251 "fastrand",
335 "fastrand",
252 "futures-core",
336 "futures-core",
253 "futures-io",
337 "futures-io",
254 "memchr",
338 "memchr",
255− "parking 2.0.0",
339+ "parking",
256 "pin-project-lite",
340 "pin-project-lite",
257 "waker-fn",
341 "waker-fn",
258]
342]
@@ -334,6 +418,7 @@ dependencies = [
334 "crossterm",
418 "crossterm",
335 "futures",
419 "futures",
336 "helix-core",
420 "helix-core",
421+ "num_cpus",
337 "smol",
422 "smol",
338]
423]
339
424
@@ -412,17 +497,6 @@ dependencies = [
412 "winapi",
497 "winapi",
413]
498]
414
499
415−[[package]]
416−name = "multitask"
417−version = "0.2.0"
418−source = "registry+https://github.com/rust-lang/crates.io-index"
419−checksum = "c09c35271e7dcdb5f709779111f2c8e8ab8e06c1b587c1c6a9e179d865aaa5b4"
420−dependencies = [
421− "async-task",
422− "concurrent-queue",
423− "fastrand",
424−]
425−
426[[package]]
500[[package]]
427name = "new_debug_unreachable"
501name = "new_debug_unreachable"
428version = "1.0.4"
502version = "1.0.4"
@@ -454,12 +528,6 @@ version = "1.4.1"
454source = "registry+https://github.com/rust-lang/crates.io-index"
528source = "registry+https://github.com/rust-lang/crates.io-index"
455checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
529checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
456
530
457−[[package]]
458−name = "parking"
459−version = "1.0.6"
460−source = "registry+https://github.com/rust-lang/crates.io-index"
461−checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c"
462−
463[[package]]
531[[package]]
464name = "parking"
532name = "parking"
465version = "2.0.0"
533version = "2.0.0"
@@ -524,12 +592,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
524
592
525[[package]]
593[[package]]
526name = "polling"
594name = "polling"
527−version = "0.1.5"
595+version = "0.1.8"
528source = "registry+https://github.com/rust-lang/crates.io-index"
596source = "registry+https://github.com/rust-lang/crates.io-index"
529−checksum = "9e09dffb745feffca5be3dea51c02b7b368c4597ab0219a82acaf9799ab3e0d1"
597+checksum = "b1e9fa0ab21ed700cf0c4ebec57ae5496bec942a0aef9545562979a9f75b97aa"
530dependencies = [
598dependencies = [
531 "cfg-if",
599 "cfg-if",
532 "libc",
600 "libc",
601+ "log",
533 "wepoll-sys-stjepang",
602 "wepoll-sys-stjepang",
534 "winapi",
603 "winapi",
535]
604]
@@ -548,9 +617,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
548
617
549[[package]]
618[[package]]
550name = "proc-macro2"
619name = "proc-macro2"
551−version = "1.0.19"
620+version = "1.0.20"
552source = "registry+https://github.com/rust-lang/crates.io-index"
621source = "registry+https://github.com/rust-lang/crates.io-index"
553−checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
622+checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
554dependencies = [
623dependencies = [
555 "unicode-xid",
624 "unicode-xid",
556]
625]
@@ -579,12 +648,6 @@ dependencies = [
579 "smallvec",
648 "smallvec",
580]
649]
581
650
582−[[package]]
583−name = "scoped-tls"
584−version = "1.0.0"
585−source = "registry+https://github.com/rust-lang/crates.io-index"
586−checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
587−
588[[package]]
651[[package]]
589name = "scopeguard"
652name = "scopeguard"
590version = "1.1.0"
653version = "1.1.0"
@@ -626,18 +689,20 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
626
689
627[[package]]
690[[package]]
628name = "smol"
691name = "smol"
629−version = "0.3.3"
692+version = "0.4.3"
630source = "registry+https://github.com/rust-lang/crates.io-index"
693source = "registry+https://github.com/rust-lang/crates.io-index"
631−checksum = "67583f4ccc13bbb105a0752058d8ad66c47753d85445952809bcaca891954f83"
694+checksum = "0714120d45176fe0b7763527a28c32af32389eb5c07e28142766080839c491ed"
632dependencies = [
695dependencies = [
633 "async-channel",
696 "async-channel",
634 "async-executor",
697 "async-executor",
698+ "async-fs",
635 "async-io",
699 "async-io",
700+ "async-lock",
701+ "async-net",
702+ "async-process",
636 "blocking",
703 "blocking",
637− "cfg-if",
638− "easy-parallel",
639 "futures-lite",
704 "futures-lite",
640− "num_cpus",
705+ "once_cell",
641]
706]
642
707
643[[package]]
708[[package]]
@@ -654,9 +719,9 @@ dependencies = [
654
719
655[[package]]
720[[package]]
656name = "syn"
721name = "syn"
657−version = "1.0.38"
722+version = "1.0.39"
658source = "registry+https://github.com/rust-lang/crates.io-index"
723source = "registry+https://github.com/rust-lang/crates.io-index"
659−checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
724+checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
660dependencies = [
725dependencies = [
661 "proc-macro2",
726 "proc-macro2",
662 "quote",
727 "quote",
@@ -666,7 +731,7 @@ dependencies = [
666[[package]]
731[[package]]
667name = "tendril"
732name = "tendril"
668version = "0.4.1"
733version = "0.4.1"
669−source = "git+https://github.com/servo/tendril#e379f8547241d84865aa45f44802feeff1126726"
734+source = "git+https://github.com/servo/tendril#9532724c32a0bf5e65acb56209373d97223bc530"
670dependencies = [
735dependencies = [
671 "futf",
736 "futf",
672 "mac",
737 "mac",
@@ -699,15 +764,15 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
699
764
700[[package]]
765[[package]]
701name = "vec-arena"
766name = "vec-arena"
702−version = "0.5.0"
767+version = "0.5.2"
703source = "registry+https://github.com/rust-lang/crates.io-index"
768source = "registry+https://github.com/rust-lang/crates.io-index"
704−checksum = "17dfb54bf57c9043f4616cb03dab30eff012cc26631b797d8354b916708db919"
769+checksum = "8cb18268690309760d59ee1a9b21132c126ba384f374c59a94db4bc03adeb561"
705
770
706[[package]]
771[[package]]
707name = "waker-fn"
772name = "waker-fn"
708−version = "1.0.0"
773+version = "1.1.0"
709source = "registry+https://github.com/rust-lang/crates.io-index"
774source = "registry+https://github.com/rust-lang/crates.io-index"
710−checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
775+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
711
776
712[[package]]
777[[package]]
713name = "wepoll-sys-stjepang"
778name = "wepoll-sys-stjepang"
editor.rsdeleted

No changes to the content.

helix-term/Cargo.toml+2−2
@@ -19,9 +19,9 @@ argh = "0.1.3"
19helix-core = { path = "../helix-core" }
19helix-core = { path = "../helix-core" }
20crossterm = { version = "0.17.7", features = ["event-stream"] }
20crossterm = { version = "0.17.7", features = ["event-stream"] }
21
21
22−smol = "0.3"
22+smol = "0.4"
23futures = { version = "0.3.5", default-features = false, features = ["std", "async-await"] }
23futures = { version = "0.3.5", default-features = false, features = ["std", "async-await"] }
24+num_cpus = "1.13.0"
24# futures-timer = "3.0.2"
25# futures-timer = "3.0.2"
25−# async-channel = "1.4.0"
26
26
27# tui = { version = "0.9.5", default-features = false }
27# tui = { version = "0.9.5", default-features = false }
helix-term/src/editor.rs+4−2
@@ -39,6 +39,8 @@ impl BufferComponent<'_> {
39 }
39 }
40}
40}
41
41
42+static EX: smol::Executor = smol::Executor::new();
43+
42pub struct Editor {
44pub struct Editor {
43 state: Option<State>,
45 state: Option<State>,
44 first_line: u16,
46 first_line: u16,
@@ -134,14 +136,14 @@ impl Editor {
134 }
136 }
135 }
137 }
136
138
137− pub fn run(&mut self) -> Result<(), Error> {
139+ pub async fn run(&mut self) -> Result<(), Error> {
138 enable_raw_mode()?;
140 enable_raw_mode()?;
139
141
140 let mut stdout = stdout();
142 let mut stdout = stdout();
141
143
142 execute!(stdout, terminal::EnterAlternateScreen)?;
144 execute!(stdout, terminal::EnterAlternateScreen)?;
143
145
144− smol::run(self.print_events());
146+ self.print_events().await;
145
147
146 execute!(stdout, terminal::LeaveAlternateScreen)?;
148 execute!(stdout, terminal::LeaveAlternateScreen)?;
147
149
helix-term/src/main.rs+9−2
@@ -18,12 +18,19 @@ pub struct Args {
18 files: Vec<PathBuf>,
18 files: Vec<PathBuf>,
19}
19}
20
20
21+static EX: smol::Executor = smol::Executor::new();
22+
21fn main() -> Result<(), Error> {
23fn main() -> Result<(), Error> {
22 let args: Args = argh::from_env();
24 let args: Args = argh::from_env();
23 println!("{:?}", args.files);
25 println!("{:?}", args.files);
24
26
27+ for _ in 0..num_cpus::get() {
28+ std::thread::spawn(move || smol::block_on(EX.run(smol::future::pending::<()>())));
29+ }
30+
31+ smol::block_on(EX.run(async {
25− let mut editor = editor::Editor::new(args)?;
32+ editor::Editor::new(args).unwrap().run().await;
26− editor.run();
33+ }));
27
34
28 Ok(())
35 Ok(())
29}
36}