git.iko.soy/helix
on master help sign in
Update dependencies.

smol 0.3 makes setup a whole lot easier.

commit4733afa6c2c2b41d70b2d76748b4feb374b0ba77 authorBlaž Hrastnik <blaz@mxxn.io> dateTue 11 Aug 2020, 23:19 (6 years ago) parent8681d47
5 files changed+210−230
compare with master
unifiedsplit
Cargo.lock+201−146 helix-term/Cargo.toml+5−6 helix-term/src/editor.rs+1−26 helix-term/src/line.rs+1−26 helix-term/src/test.rs+2−26
Cargo.lock+201−146
@@ -2,9 +2,9 @@
22# It is not intended for manual editing.
33[[package]]
44name = "anyhow"
5−version = "1.0.31"
5+version = "1.0.32"
66source = "registry+https://github.com/rust-lang/crates.io-index"
7−checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
7+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
88
99[[package]]
1010name = "arc-swap"
@@ -41,6 +41,50 @@ version = "0.1.1"
4141source = "registry+https://github.com/rust-lang/crates.io-index"
4242checksum = "e1ba68f4276a778591e36a0c348a269888f3a177c8d2054969389e3b59611ff5"
4343
44+[[package]]
45+name = "async-channel"
46+version = "1.4.0"
47+source = "registry+https://github.com/rust-lang/crates.io-index"
48+checksum = "43de69555a39d52918e2bc33a408d3c0a86c829b212d898f4ca25d21a6387478"
49+dependencies = [
50+ "concurrent-queue",
51+ "event-listener",
52+ "futures-core",
53+]
54+
55+[[package]]
56+name = "async-executor"
57+version = "0.1.2"
58+source = "registry+https://github.com/rust-lang/crates.io-index"
59+checksum = "90f47c78ea98277cb1f5e6f60ba4fc762f5eafe9f6511bc2f7dfd8b75c225650"
60+dependencies = [
61+ "async-io",
62+ "futures-lite",
63+ "multitask",
64+ "parking 1.0.6",
65+ "scoped-tls",
66+ "waker-fn",
67+]
68+
69+[[package]]
70+name = "async-io"
71+version = "0.1.11"
72+source = "registry+https://github.com/rust-lang/crates.io-index"
73+checksum = "3ae22a338d28c75b53702b66f77979062cb29675db376d99e451af4fa79dedb3"
74+dependencies = [
75+ "cfg-if",
76+ "concurrent-queue",
77+ "futures-lite",
78+ "libc",
79+ "once_cell",
80+ "parking 2.0.0",
81+ "polling",
82+ "socket2",
83+ "vec-arena",
84+ "wepoll-sys-stjepang",
85+ "winapi",
86+]
87+
4488[[package]]
4589name = "async-task"
4690version = "3.0.0"
@@ -48,10 +92,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
4892checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3"
4993
5094[[package]]
51−name = "autocfg"
95+name = "atomic-waker"
5296version = "1.0.0"
5397source = "registry+https://github.com/rust-lang/crates.io-index"
54−checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
98+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
5599
56100[[package]]
57101name = "bitflags"
@@ -59,11 +103,30 @@ version = "1.2.1"
59103source = "registry+https://github.com/rust-lang/crates.io-index"
60104checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
61105
106+[[package]]
107+name = "blocking"
108+version = "0.5.0"
109+source = "registry+https://github.com/rust-lang/crates.io-index"
110+checksum = "76e94bf99b692f54c9d05f97454d3faf11134523fe5b180564a3fb6ed63bcc0a"
111+dependencies = [
112+ "async-channel",
113+ "atomic-waker",
114+ "futures-lite",
115+ "once_cell",
116+ "waker-fn",
117+]
118+
119+[[package]]
120+name = "cache-padded"
121+version = "1.1.1"
122+source = "registry+https://github.com/rust-lang/crates.io-index"
123+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
124+
62125[[package]]
63126name = "cc"
64−version = "1.0.54"
127+version = "1.0.58"
65128source = "registry+https://github.com/rust-lang/crates.io-index"
66−checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
129+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
67130
68131[[package]]
69132name = "cfg-if"
@@ -81,61 +144,23 @@ dependencies = [
81144]
82145
83146[[package]]
84−name = "crossbeam-deque"
85−version = "0.7.3"
147+name = "concurrent-queue"
148+version = "1.2.2"
86149source = "registry+https://github.com/rust-lang/crates.io-index"
87−checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
150+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
88151dependencies = [
89− "crossbeam-epoch",
90− "crossbeam-utils",
91− "maybe-uninit",
92−]
93−
94−[[package]]
95−name = "crossbeam-epoch"
96−version = "0.8.2"
97−source = "registry+https://github.com/rust-lang/crates.io-index"
98−checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
99−dependencies = [
100− "autocfg",
101− "cfg-if",
102− "crossbeam-utils",
103− "lazy_static",
104− "maybe-uninit",
105− "memoffset",
106− "scopeguard",
107−]
108−
109−[[package]]
110−name = "crossbeam-queue"
111−version = "0.2.3"
112−source = "registry+https://github.com/rust-lang/crates.io-index"
113−checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
114−dependencies = [
115− "cfg-if",
116− "crossbeam-utils",
117− "maybe-uninit",
118−]
119−
120−[[package]]
121−name = "crossbeam-utils"
122−version = "0.7.2"
123−source = "registry+https://github.com/rust-lang/crates.io-index"
124−checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
125−dependencies = [
126− "autocfg",
127− "cfg-if",
128− "lazy_static",
152+ "cache-padded",
129153]
130154
131155[[package]]
132156name = "crossterm"
133−version = "0.17.4"
134−source = "git+https://github.com/crossterm-rs/crossterm?branch=mio-update#4ab507dfc41a32dec0d8249f599b02c3a78a83f7"
157+version = "0.17.7"
158+source = "registry+https://github.com/rust-lang/crates.io-index"
159+checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7"
135160dependencies = [
136161 "bitflags",
137162 "crossterm_winapi",
138− "futures",
163+ "futures-util",
139164 "lazy_static",
140165 "libc",
141166 "mio",
@@ -153,6 +178,24 @@ dependencies = [
153178 "winapi",
154179]
155180
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]]
188+name = "event-listener"
189+version = "2.3.3"
190+source = "registry+https://github.com/rust-lang/crates.io-index"
191+checksum = "7f14646a9e0430150a87951622ba9675472b68e384b7701b8423b30560805c7a"
192+
193+[[package]]
194+name = "fastrand"
195+version = "1.3.4"
196+source = "registry+https://github.com/rust-lang/crates.io-index"
197+checksum = "4bd3bdaaf0a72155260a1c098989b60db1cbb22d6a628e64f16237aa4da93cc7"
198+
156199[[package]]
157200name = "futf"
158201version = "0.1.4"
@@ -171,7 +214,6 @@ checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
171214dependencies = [
172215 "futures-channel",
173216 "futures-core",
174− "futures-executor",
175217 "futures-io",
176218 "futures-sink",
177219 "futures-task",
@@ -195,21 +237,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
195237checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
196238
197239[[package]]
198−name = "futures-executor"
240+name = "futures-io"
199241version = "0.3.5"
200242source = "registry+https://github.com/rust-lang/crates.io-index"
201−checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
202−dependencies = [
203− "futures-core",
204− "futures-task",
205− "futures-util",
206−]
243+checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
207244
208245[[package]]
209−name = "futures-io"
210−version = "0.3.5"
246+name = "futures-lite"
247+version = "0.1.10"
211248source = "registry+https://github.com/rust-lang/crates.io-index"
212−checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
249+checksum = "bbe71459749b2e8e66fb95df721b22fa08661ad384a0c5b519e11d3893b4692a"
250+dependencies = [
251+ "fastrand",
252+ "futures-core",
253+ "futures-io",
254+ "memchr",
255+ "parking 1.0.6",
256+ "pin-project-lite",
257+ "waker-fn",
258+]
213259
214260[[package]]
215261name = "futures-macro"
@@ -288,16 +334,14 @@ dependencies = [
288334 "crossterm",
289335 "futures",
290336 "helix-core",
291− "num_cpus",
292− "piper",
293337 "smol",
294338]
295339
296340[[package]]
297341name = "hermit-abi"
298−version = "0.1.14"
342+version = "0.1.15"
299343source = "registry+https://github.com/rust-lang/crates.io-index"
300−checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909"
344+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
301345dependencies = [
302346 "libc",
303347]
@@ -310,9 +354,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
310354
311355[[package]]
312356name = "libc"
313−version = "0.2.71"
357+version = "0.2.74"
314358source = "registry+https://github.com/rust-lang/crates.io-index"
315−checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
359+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
316360
317361[[package]]
318362name = "lock_api"
@@ -325,9 +369,9 @@ dependencies = [
325369
326370[[package]]
327371name = "log"
328−version = "0.4.8"
372+version = "0.4.11"
329373source = "registry+https://github.com/rust-lang/crates.io-index"
330−checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
374+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
331375dependencies = [
332376 "cfg-if",
333377]
@@ -338,27 +382,12 @@ version = "0.1.1"
338382source = "registry+https://github.com/rust-lang/crates.io-index"
339383checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
340384
341−[[package]]
342−name = "maybe-uninit"
343−version = "2.0.0"
344−source = "registry+https://github.com/rust-lang/crates.io-index"
345−checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
346−
347385[[package]]
348386name = "memchr"
349387version = "2.3.3"
350388source = "registry+https://github.com/rust-lang/crates.io-index"
351389checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
352390
353−[[package]]
354−name = "memoffset"
355−version = "0.5.4"
356−source = "registry+https://github.com/rust-lang/crates.io-index"
357−checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
358−dependencies = [
359− "autocfg",
360−]
361−
362391[[package]]
363392name = "mio"
364393version = "0.7.0"
@@ -383,6 +412,17 @@ dependencies = [
383412 "winapi",
384413]
385414
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+
386426[[package]]
387427name = "new_debug_unreachable"
388428version = "1.0.4"
@@ -414,6 +454,18 @@ version = "1.4.0"
414454source = "registry+https://github.com/rust-lang/crates.io-index"
415455checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
416456
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]]
464+name = "parking"
465+version = "2.0.0"
466+source = "registry+https://github.com/rust-lang/crates.io-index"
467+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
468+
417469[[package]]
418470name = "parking_lot"
419471version = "0.10.2"
@@ -440,24 +492,30 @@ dependencies = [
440492
441493[[package]]
442494name = "pin-project"
443−version = "0.4.22"
495+version = "0.4.23"
444496source = "registry+https://github.com/rust-lang/crates.io-index"
445−checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
497+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
446498dependencies = [
447499 "pin-project-internal",
448500]
449501
450502[[package]]
451503name = "pin-project-internal"
452−version = "0.4.22"
504+version = "0.4.23"
453505source = "registry+https://github.com/rust-lang/crates.io-index"
454−checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
506+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
455507dependencies = [
456508 "proc-macro2",
457509 "quote",
458510 "syn",
459511]
460512
513+[[package]]
514+name = "pin-project-lite"
515+version = "0.1.7"
516+source = "registry+https://github.com/rust-lang/crates.io-index"
517+checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
518+
461519[[package]]
462520name = "pin-utils"
463521version = "0.1.0"
@@ -465,22 +523,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
465523checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
466524
467525[[package]]
468−name = "piper"
469−version = "0.1.3"
526+name = "polling"
527+version = "0.1.2"
470528source = "registry+https://github.com/rust-lang/crates.io-index"
471−checksum = "01608bfa680dafb103f9207fa944facf572e4e3e708d10de19a0d0c3d36e5f18"
529+checksum = "c134fc4b7c9b673e3002cbcdc07ccf84c50205e29a32f7ebe660095865514de3"
472530dependencies = [
473− "crossbeam-utils",
474− "futures-io",
475− "futures-sink",
476− "futures-util",
531+ "cfg-if",
532+ "libc",
533+ "wepoll-sys-stjepang",
534+ "winapi",
477535]
478536
479537[[package]]
480538name = "proc-macro-hack"
481−version = "0.5.16"
539+version = "0.5.18"
482540source = "registry+https://github.com/rust-lang/crates.io-index"
483−checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
541+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
484542
485543[[package]]
486544name = "proc-macro-nested"
@@ -490,9 +548,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
490548
491549[[package]]
492550name = "proc-macro2"
493−version = "1.0.18"
551+version = "1.0.19"
494552source = "registry+https://github.com/rust-lang/crates.io-index"
495−checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
553+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
496554dependencies = [
497555 "unicode-xid",
498556]
@@ -508,9 +566,9 @@ dependencies = [
508566
509567[[package]]
510568name = "redox_syscall"
511−version = "0.1.56"
569+version = "0.1.57"
512570source = "registry+https://github.com/rust-lang/crates.io-index"
513−checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
571+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
514572
515573[[package]]
516574name = "ropey"
@@ -522,10 +580,10 @@ dependencies = [
522580]
523581
524582[[package]]
525−name = "scoped-tls-hkt"
526−version = "0.1.2"
583+name = "scoped-tls"
584+version = "1.0.0"
527585source = "registry+https://github.com/rust-lang/crates.io-index"
528−checksum = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63"
586+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
529587
530588[[package]]
531589name = "scopeguard"
@@ -535,9 +593,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
535593
536594[[package]]
537595name = "signal-hook"
538−version = "0.1.15"
596+version = "0.1.16"
539597source = "registry+https://github.com/rust-lang/crates.io-index"
540−checksum = "8ff2db2112d6c761e12522c65f7768548bd6e8cd23d2a9dae162520626629bd6"
598+checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed"
541599dependencies = [
542600 "libc",
543601 "mio",
@@ -546,9 +604,9 @@ dependencies = [
546604
547605[[package]]
548606name = "signal-hook-registry"
549−version = "1.2.0"
607+version = "1.2.1"
550608source = "registry+https://github.com/rust-lang/crates.io-index"
551−checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
609+checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
552610dependencies = [
553611 "arc-swap",
554612 "libc",
@@ -562,29 +620,24 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
562620
563621[[package]]
564622name = "smallvec"
565−version = "1.4.0"
623+version = "1.4.1"
566624source = "registry+https://github.com/rust-lang/crates.io-index"
567−checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
625+checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
568626
569627[[package]]
570628name = "smol"
571−version = "0.1.12"
629+version = "0.3.3"
572630source = "registry+https://github.com/rust-lang/crates.io-index"
573−checksum = "afcf8beb4aa23cc616e3351e49585153b462637c8fec929163b54d88e522b3b0"
631+checksum = "67583f4ccc13bbb105a0752058d8ad66c47753d85445952809bcaca891954f83"
574632dependencies = [
575− "async-task",
576− "crossbeam-deque",
577− "crossbeam-queue",
578− "crossbeam-utils",
579− "futures-io",
580− "futures-util",
581− "libc",
582− "once_cell",
583− "piper",
584− "scoped-tls-hkt",
585− "slab",
586− "socket2",
587− "wepoll-binding",
633+ "async-channel",
634+ "async-executor",
635+ "async-io",
636+ "blocking",
637+ "cfg-if",
638+ "easy-parallel",
639+ "futures-lite",
640+ "num_cpus",
588641]
589642
590643[[package]]
@@ -601,9 +654,9 @@ dependencies = [
601654
602655[[package]]
603656name = "syn"
604−version = "1.0.31"
657+version = "1.0.38"
605658source = "registry+https://github.com/rust-lang/crates.io-index"
606−checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
659+checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
607660dependencies = [
608661 "proc-macro2",
609662 "quote",
@@ -613,7 +666,7 @@ dependencies = [
613666[[package]]
614667name = "tendril"
615668version = "0.4.1"
616−source = "git+https://github.com/servo/tendril#08f7f292ab82c00e9cf491b5918a76e53af92c8c"
669+source = "git+https://github.com/servo/tendril#e379f8547241d84865aa45f44802feeff1126726"
617670dependencies = [
618671 "futf",
619672 "mac",
@@ -628,15 +681,15 @@ checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
628681
629682[[package]]
630683name = "unicode-width"
631−version = "0.1.7"
684+version = "0.1.8"
632685source = "registry+https://github.com/rust-lang/crates.io-index"
633−checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
686+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
634687
635688[[package]]
636689name = "unicode-xid"
637−version = "0.2.0"
690+version = "0.2.1"
638691source = "registry+https://github.com/rust-lang/crates.io-index"
639−checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
692+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
640693
641694[[package]]
642695name = "utf-8"
@@ -645,29 +698,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
645698checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
646699
647700[[package]]
648−name = "wepoll-binding"
649−version = "2.0.2"
701+name = "vec-arena"
702+version = "0.5.0"
650703source = "registry+https://github.com/rust-lang/crates.io-index"
651−checksum = "374fff4ff9701ff8b6ad0d14bacd3156c44063632d8c136186ff5967d48999a7"
652−dependencies = [
653− "bitflags",
654− "wepoll-sys",
655−]
704+checksum = "17dfb54bf57c9043f4616cb03dab30eff012cc26631b797d8354b916708db919"
656705
657706[[package]]
658−name = "wepoll-sys"
659−version = "2.0.0"
707+name = "waker-fn"
708+version = "1.0.0"
709+source = "registry+https://github.com/rust-lang/crates.io-index"
710+checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
711+
712+[[package]]
713+name = "wepoll-sys-stjepang"
714+version = "1.0.6"
660715source = "registry+https://github.com/rust-lang/crates.io-index"
661−checksum = "9082a777aed991f6769e2b654aa0cb29f1c3d615daf009829b07b66c7aff6a24"
716+checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
662717dependencies = [
663718 "cc",
664719]
665720
666721[[package]]
667722name = "winapi"
668−version = "0.3.8"
723+version = "0.3.9"
669724source = "registry+https://github.com/rust-lang/crates.io-index"
670−checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
725+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
671726dependencies = [
672727 "winapi-i686-pc-windows-gnu",
673728 "winapi-x86_64-pc-windows-gnu",
helix-term/Cargo.toml+5−6
@@ -17,12 +17,11 @@ path = "src/main.rs"
1717anyhow = "1.0.31"
1818argh = "0.1.3"
1919helix-core = { path = "../helix-core" }
20−# crossterm = { version = "0.17.5", features = ["event-stream"] }
21−crossterm = { git = "https://github.com/crossterm-rs/crossterm", branch = "mio-update", features = ["event-stream"] }
20+crossterm = { version = "0.17.7", features = ["event-stream"] }
2221
23−futures = { version = "0.3.5", default-features = false, features = ["std"] }
22+smol = "0.3"
23+futures = { version = "0.3.5", default-features = false, features = ["std", "async-await"] }
2424# futures-timer = "3.0.2"
25−smol = "0.1.10"
26−num_cpus = "1.13.0"
27−piper = "0.1.2"
25+# async-channel = "1.4.0"
26+
2827# tui = { version = "0.9.5", default-features = false }
helix-term/src/editor.rs+1−26
@@ -144,35 +144,10 @@ impl Editor {
144144
145145 execute!(stdout, terminal::EnterAlternateScreen)?;
146146
147− use std::thread;
148−
149− // Same number of threads as there are CPU cores.
150− let num_threads = num_cpus::get().max(1);
151−
152− // A channel that sends the shutdown signal.
153− let (s, r) = piper::chan::<()>(0);
154− let mut threads = Vec::new();
155−
156− // Create an executor thread pool.
157− for _ in 0..num_threads {
158− // Spawn an executor thread that waits for the shutdown signal.
159− let r = r.clone();
160− threads.push(thread::spawn(move || smol::run(r.recv())));
161− }
162−
163− // No need to `run()`, now we can just block on the main future.
164− smol::block_on(self.print_events());
165−
166− // Send a shutdown signal.
167− drop(s);
147+ smol::run(self.print_events());
168148
169149 execute!(stdout, terminal::LeaveAlternateScreen)?;
170150
171− // Wait for threads to finish.
172− for t in threads {
173− t.join().unwrap();
174− }
175−
176151 disable_raw_mode()?;
177152
178153 Ok(())
helix-term/src/line.rs+1−26
@@ -64,32 +64,7 @@ fn main() -> Result<()> {
6464 let mut stdout = stdout();
6565 execute!(stdout, EnableMouseCapture)?;
6666
67− use std::thread;
68−
69− // Same number of threads as there are CPU cores.
70− let num_threads = num_cpus::get().max(1);
71−
72− // A channel that sends the shutdown signal.
73− let (s, r) = piper::chan::<()>(0);
74− let mut threads = Vec::new();
75−
76− // Create an executor thread pool.
77− for _ in 0..num_threads {
78− // Spawn an executor thread that waits for the shutdown signal.
79− let r = r.clone();
80− threads.push(thread::spawn(move || smol::run(r.recv())));
81− }
82−
83− // No need to `run()`, now we can just block on the main future.
84− smol::block_on(print_events());
85−
86− // Send a shutdown signal.
87− drop(s);
88−
89− // Wait for threads to finish.
90− for t in threads {
91− t.join().unwrap();
92− }
67+ smol::run(print_events());
9368
9469 execute!(stdout, DisableMouseCapture)?;
9570
helix-term/src/test.rs+2−26
@@ -42,7 +42,7 @@ async fn print_events() {
4242
4343 if event == Event::Key(KeyCode::Char('c').into()) {
4444 println!("Cursor position: {:?}\r", position());
45−
45+
4646 }
4747
4848 println!("test");
@@ -67,32 +67,8 @@ fn main() -> Result<()> {
6767 let mut stdout = stdout();
6868 execute!(stdout, EnableMouseCapture)?;
6969
70− use std::thread;
71−
72− // Same number of threads as there are CPU cores.
73− let num_threads = num_cpus::get().max(1);
74−
75− // A channel that sends the shutdown signal.
76− let (s, r) = piper::chan::<()>(0);
77− let mut threads = Vec::new();
78−
79− // Create an executor thread pool.
80− for _ in 0..num_threads {
81− // Spawn an executor thread that waits for the shutdown signal.
82− let r = r.clone();
83− threads.push(thread::spawn(move || smol::run(r.recv())));
84− }
85−
8670 // No need to `run()`, now we can just block on the main future.
87− smol::block_on(print_events());
88−
89− // Send a shutdown signal.
90− drop(s);
91−
92− // Wait for threads to finish.
93− for t in threads {
94− t.join().unwrap();
95− }
71+ smol::run(print_events());
9672
9773 execute!(stdout, DisableMouseCapture)?;
9874