aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshay <[email protected]>2021-01-25 09:54:48 +0000
committerAkshay <[email protected]>2021-01-25 09:54:48 +0000
commit84c154018ebdd19acae10d6c9c802b41353507dc (patch)
tree0da090741689a19abb8ba90a9caf25e23e489c13
parentc26de6fbfd55cca906b9c184621a9f550cdcc0f1 (diff)
parent3fc86c52f7fab0a1e0fcdd3be17bd5a53135225e (diff)
Merge branch 'master' of https://github.com/gyscos/dijo into cursive-0.16
-rw-r--r--Cargo.lock224
-rw-r--r--Cargo.toml2
-rw-r--r--src/main.rs4
3 files changed, 93 insertions, 137 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 3b64068..54a7d40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,20 +2,13 @@
2# It is not intended for manual editing. 2# It is not intended for manual editing.
3[[package]] 3[[package]]
4name = "ahash" 4name = "ahash"
5version = "0.3.8" 5version = "0.6.3"
6source = "registry+https://github.com/rust-lang/crates.io-index" 6source = "registry+https://github.com/rust-lang/crates.io-index"
7checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" 7checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877"
8dependencies = [ 8dependencies = [
9 "const-random", 9 "getrandom 0.2.1",
10] 10 "once_cell",
11 11 "version_check",
12[[package]]
13name = "ahash"
14version = "0.4.7"
15source = "registry+https://github.com/rust-lang/crates.io-index"
16checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
17dependencies = [
18 "const-random",
19] 12]
20 13
21[[package]] 14[[package]]
@@ -127,37 +120,6 @@ dependencies = [
127] 120]
128 121
129[[package]] 122[[package]]
130name = "cloudabi"
131version = "0.0.3"
132source = "registry+https://github.com/rust-lang/crates.io-index"
133checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
134dependencies = [
135 "bitflags",
136]
137
138[[package]]
139name = "const-random"
140version = "0.1.13"
141source = "registry+https://github.com/rust-lang/crates.io-index"
142checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
143dependencies = [
144 "const-random-macro",
145 "proc-macro-hack",
146]
147
148[[package]]
149name = "const-random-macro"
150version = "0.1.13"
151source = "registry+https://github.com/rust-lang/crates.io-index"
152checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
153dependencies = [
154 "getrandom 0.2.1",
155 "lazy_static",
156 "proc-macro-hack",
157 "tiny-keccak",
158]
159
160[[package]]
161name = "constant_time_eq" 123name = "constant_time_eq"
162version = "0.1.5" 124version = "0.1.5"
163source = "registry+https://github.com/rust-lang/crates.io-index" 125source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -165,23 +127,12 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
165 127
166[[package]] 128[[package]]
167name = "crossbeam-channel" 129name = "crossbeam-channel"
168version = "0.4.4" 130version = "0.5.0"
169source = "registry+https://github.com/rust-lang/crates.io-index"
170checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
171dependencies = [
172 "crossbeam-utils 0.7.2",
173 "maybe-uninit",
174]
175
176[[package]]
177name = "crossbeam-utils"
178version = "0.7.2"
179source = "registry+https://github.com/rust-lang/crates.io-index" 131source = "registry+https://github.com/rust-lang/crates.io-index"
180checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" 132checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
181dependencies = [ 133dependencies = [
182 "autocfg", 134 "cfg-if 1.0.0",
183 "cfg-if 0.1.10", 135 "crossbeam-utils",
184 "lazy_static",
185] 136]
186 137
187[[package]] 138[[package]]
@@ -197,9 +148,9 @@ dependencies = [
197 148
198[[package]] 149[[package]]
199name = "crossterm" 150name = "crossterm"
200version = "0.17.7" 151version = "0.19.0"
201source = "registry+https://github.com/rust-lang/crates.io-index" 152source = "registry+https://github.com/rust-lang/crates.io-index"
202checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" 153checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c"
203dependencies = [ 154dependencies = [
204 "bitflags", 155 "bitflags",
205 "crossterm_winapi", 156 "crossterm_winapi",
@@ -207,26 +158,20 @@ dependencies = [
207 "libc", 158 "libc",
208 "mio 0.7.7", 159 "mio 0.7.7",
209 "parking_lot", 160 "parking_lot",
210 "signal-hook", 161 "signal-hook 0.1.17",
211 "winapi 0.3.9", 162 "winapi 0.3.9",
212] 163]
213 164
214[[package]] 165[[package]]
215name = "crossterm_winapi" 166name = "crossterm_winapi"
216version = "0.6.2" 167version = "0.7.0"
217source = "registry+https://github.com/rust-lang/crates.io-index" 168source = "registry+https://github.com/rust-lang/crates.io-index"
218checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" 169checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9"
219dependencies = [ 170dependencies = [
220 "winapi 0.3.9", 171 "winapi 0.3.9",
221] 172]
222 173
223[[package]] 174[[package]]
224name = "crunchy"
225version = "0.2.2"
226source = "registry+https://github.com/rust-lang/crates.io-index"
227checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
228
229[[package]]
230name = "ctor" 175name = "ctor"
231version = "0.1.17" 176version = "0.1.17"
232source = "registry+https://github.com/rust-lang/crates.io-index" 177source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -238,44 +183,44 @@ dependencies = [
238 183
239[[package]] 184[[package]]
240name = "cursive" 185name = "cursive"
241version = "0.15.0" 186version = "0.16.3"
242source = "registry+https://github.com/rust-lang/crates.io-index" 187source = "registry+https://github.com/rust-lang/crates.io-index"
243checksum = "7a9f12332ab2bca26979ef00cfef9a1c2e287db03b787a83d892ad9961f81374" 188checksum = "6593c3409eb794bf22090bec60dda1e19d1def284478bec7e5a92da3cf977c52"
244dependencies = [ 189dependencies = [
245 "ahash 0.3.8", 190 "ahash",
246 "cfg-if 0.1.10", 191 "cfg-if 1.0.0",
247 "crossbeam-channel", 192 "crossbeam-channel",
248 "crossterm", 193 "crossterm",
249 "cursive_core", 194 "cursive_core",
250 "enumset",
251 "lazy_static", 195 "lazy_static",
252 "libc", 196 "libc",
253 "log", 197 "log",
254 "signal-hook", 198 "signal-hook 0.3.4",
255 "termion", 199 "termion",
256 "unicode-segmentation", 200 "unicode-segmentation",
257 "unicode-width", 201 "unicode-width",
202 "wasmer_enumset",
258] 203]
259 204
260[[package]] 205[[package]]
261name = "cursive_core" 206name = "cursive_core"
262version = "0.1.1" 207version = "0.2.2"
263source = "registry+https://github.com/rust-lang/crates.io-index" 208source = "registry+https://github.com/rust-lang/crates.io-index"
264checksum = "85fc5b6a8ba2f1bc743892068bde466438f78d6247197e2dc094bfd53fdea4b7" 209checksum = "025ac0bcd21ced752d27b70e6aa2285a3513d07b5a0c7f89e71121d20ca1429d"
265dependencies = [ 210dependencies = [
266 "ahash 0.4.7", 211 "ahash",
267 "chrono", 212 "chrono",
268 "crossbeam-channel", 213 "crossbeam-channel",
269 "enum-map", 214 "enum-map",
270 "enumset",
271 "lazy_static", 215 "lazy_static",
272 "libc", 216 "libc",
273 "log", 217 "log",
274 "num", 218 "num",
275 "owning_ref", 219 "owning_ref",
276 "signal-hook", 220 "syn",
277 "unicode-segmentation", 221 "unicode-segmentation",
278 "unicode-width", 222 "unicode-width",
223 "wasmer_enumset",
279 "xi-unicode", 224 "xi-unicode",
280] 225]
281 226
@@ -374,28 +319,6 @@ dependencies = [
374] 319]
375 320
376[[package]] 321[[package]]
377name = "enumset"
378version = "1.0.1"
379source = "registry+https://github.com/rust-lang/crates.io-index"
380checksum = "959a80a2062fedd66ed41d99736212de987b3a8c83a4c2cef243968075256bd1"
381dependencies = [
382 "enumset_derive",
383 "num-traits",
384]
385
386[[package]]
387name = "enumset_derive"
388version = "0.5.0"
389source = "registry+https://github.com/rust-lang/crates.io-index"
390checksum = "74bef436ac71820c5cf768d7af9ba33121246b09a00e09a55d94ef8095a875ac"
391dependencies = [
392 "darling",
393 "proc-macro2",
394 "quote",
395 "syn",
396]
397
398[[package]]
399name = "erased-serde" 322name = "erased-serde"
400version = "0.3.13" 323version = "0.3.13"
401source = "registry+https://github.com/rust-lang/crates.io-index" 324source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -526,6 +449,15 @@ dependencies = [
526] 449]
527 450
528[[package]] 451[[package]]
452name = "instant"
453version = "0.1.9"
454source = "registry+https://github.com/rust-lang/crates.io-index"
455checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
456dependencies = [
457 "cfg-if 1.0.0",
458]
459
460[[package]]
529name = "inventory" 461name = "inventory"
530version = "0.1.10" 462version = "0.1.10"
531source = "registry+https://github.com/rust-lang/crates.io-index" 463source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -592,9 +524,9 @@ checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
592 524
593[[package]] 525[[package]]
594name = "lock_api" 526name = "lock_api"
595version = "0.3.4" 527version = "0.4.2"
596source = "registry+https://github.com/rust-lang/crates.io-index" 528source = "registry+https://github.com/rust-lang/crates.io-index"
597checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" 529checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
598dependencies = [ 530dependencies = [
599 "scopeguard", 531 "scopeguard",
600] 532]
@@ -609,12 +541,6 @@ dependencies = [
609] 541]
610 542
611[[package]] 543[[package]]
612name = "maybe-uninit"
613version = "2.0.0"
614source = "registry+https://github.com/rust-lang/crates.io-index"
615checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
616
617[[package]]
618name = "mio" 544name = "mio"
619version = "0.6.23" 545version = "0.6.23"
620source = "registry+https://github.com/rust-lang/crates.io-index" 546source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -788,6 +714,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
788checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" 714checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
789 715
790[[package]] 716[[package]]
717name = "once_cell"
718version = "1.5.2"
719source = "registry+https://github.com/rust-lang/crates.io-index"
720checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
721
722[[package]]
791name = "owning_ref" 723name = "owning_ref"
792version = "0.4.1" 724version = "0.4.1"
793source = "registry+https://github.com/rust-lang/crates.io-index" 725source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -798,22 +730,23 @@ dependencies = [
798 730
799[[package]] 731[[package]]
800name = "parking_lot" 732name = "parking_lot"
801version = "0.10.2" 733version = "0.11.1"
802source = "registry+https://github.com/rust-lang/crates.io-index" 734source = "registry+https://github.com/rust-lang/crates.io-index"
803checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" 735checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
804dependencies = [ 736dependencies = [
737 "instant",
805 "lock_api", 738 "lock_api",
806 "parking_lot_core", 739 "parking_lot_core",
807] 740]
808 741
809[[package]] 742[[package]]
810name = "parking_lot_core" 743name = "parking_lot_core"
811version = "0.7.2" 744version = "0.8.2"
812source = "registry+https://github.com/rust-lang/crates.io-index" 745source = "registry+https://github.com/rust-lang/crates.io-index"
813checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" 746checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
814dependencies = [ 747dependencies = [
815 "cfg-if 0.1.10", 748 "cfg-if 1.0.0",
816 "cloudabi", 749 "instant",
817 "libc", 750 "libc",
818 "redox_syscall", 751 "redox_syscall",
819 "smallvec", 752 "smallvec",
@@ -821,12 +754,6 @@ dependencies = [
821] 754]
822 755
823[[package]] 756[[package]]
824name = "proc-macro-hack"
825version = "0.5.19"
826source = "registry+https://github.com/rust-lang/crates.io-index"
827checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
828
829[[package]]
830name = "proc-macro2" 757name = "proc-macro2"
831version = "1.0.24" 758version = "1.0.24"
832source = "registry+https://github.com/rust-lang/crates.io-index" 759source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -879,7 +806,7 @@ dependencies = [
879 "base64", 806 "base64",
880 "blake2b_simd", 807 "blake2b_simd",
881 "constant_time_eq", 808 "constant_time_eq",
882 "crossbeam-utils 0.8.1", 809 "crossbeam-utils",
883] 810]
884 811
885[[package]] 812[[package]]
@@ -946,6 +873,16 @@ dependencies = [
946] 873]
947 874
948[[package]] 875[[package]]
876name = "signal-hook"
877version = "0.3.4"
878source = "registry+https://github.com/rust-lang/crates.io-index"
879checksum = "780f5e3fe0c66f67197236097d89de1e86216f1f6fdeaf47c442f854ab46c240"
880dependencies = [
881 "libc",
882 "signal-hook-registry",
883]
884
885[[package]]
949name = "signal-hook-registry" 886name = "signal-hook-registry"
950version = "1.3.0" 887version = "1.3.0"
951source = "registry+https://github.com/rust-lang/crates.io-index" 888source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1038,15 +975,6 @@ dependencies = [
1038] 975]
1039 976
1040[[package]] 977[[package]]
1041name = "tiny-keccak"
1042version = "2.0.2"
1043source = "registry+https://github.com/rust-lang/crates.io-index"
1044checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
1045dependencies = [
1046 "crunchy",
1047]
1048
1049[[package]]
1050name = "toml" 978name = "toml"
1051version = "0.5.8" 979version = "0.5.8"
1052source = "registry+https://github.com/rust-lang/crates.io-index" 980source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1104,6 +1032,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1104checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" 1032checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
1105 1033
1106[[package]] 1034[[package]]
1035name = "version_check"
1036version = "0.9.2"
1037source = "registry+https://github.com/rust-lang/crates.io-index"
1038checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
1039
1040[[package]]
1107name = "walkdir" 1041name = "walkdir"
1108version = "2.3.1" 1042version = "2.3.1"
1109source = "registry+https://github.com/rust-lang/crates.io-index" 1043source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1127,6 +1061,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1127checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" 1061checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
1128 1062
1129[[package]] 1063[[package]]
1064name = "wasmer_enumset"
1065version = "1.0.1"
1066source = "registry+https://github.com/rust-lang/crates.io-index"
1067checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8"
1068dependencies = [
1069 "num-traits",
1070 "wasmer_enumset_derive",
1071]
1072
1073[[package]]
1074name = "wasmer_enumset_derive"
1075version = "0.5.0"
1076source = "registry+https://github.com/rust-lang/crates.io-index"
1077checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88"
1078dependencies = [
1079 "darling",
1080 "proc-macro2",
1081 "quote",
1082 "syn",
1083]
1084
1085[[package]]
1130name = "winapi" 1086name = "winapi"
1131version = "0.2.8" 1087version = "0.2.8"
1132source = "registry+https://github.com/rust-lang/crates.io-index" 1088source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1181,6 +1137,6 @@ dependencies = [
1181 1137
1182[[package]] 1138[[package]]
1183name = "xi-unicode" 1139name = "xi-unicode"
1184version = "0.2.1" 1140version = "0.3.0"
1185source = "registry+https://github.com/rust-lang/crates.io-index" 1141source = "registry+https://github.com/rust-lang/crates.io-index"
1186checksum = "e71b85d8b1b8bfaf4b5c834187554d201a8cd621c2bbfa33efd41a3ecabd48b2" 1142checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
diff --git a/Cargo.toml b/Cargo.toml
index ba98e65..700e899 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ toml = "0.5.6"
23syn = "=1.0.57" 23syn = "=1.0.57"
24 24
25[dependencies.cursive] 25[dependencies.cursive]
26version = "0.15" 26version = "0.16"
27default-features = false 27default-features = false
28 28
29[dependencies.chrono] 29[dependencies.chrono]
diff --git a/src/main.rs b/src/main.rs
index 5280b35..92e29f9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -69,10 +69,10 @@ fn main() {
69 } 69 }
70 } else { 70 } else {
71 #[cfg(any(feature = "termion-backend", feature = "default"))] 71 #[cfg(any(feature = "termion-backend", feature = "default"))]
72 let mut s = termion().unwrap(); 72 let mut s = termion();
73 73
74 #[cfg(feature = "crossterm-backend")] 74 #[cfg(feature = "crossterm-backend")]
75 let mut s = crossterm().unwrap(); 75 let mut s = crossterm();
76 76
77 let app = App::load_state(); 77 let app = App::load_state();
78 let layout = NamedView::new( 78 let layout = NamedView::new(