From 2480696c27cb8466bb0b07239e65564a7f1fad0d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 23 Apr 2021 23:33:36 +0200 Subject: [PATCH] deps: Update `cursive` and `cursive_table_view`. Now that `cursive_table_view` was updated to support the newest version of `cursive`, we can _finally_ get rid of the git version of `cursive_table_view` and use the crates.io one. --- Cargo.lock | 184 ++++++++++++++++++++-------------------------------- Cargo.toml | 12 ++-- src/main.rs | 12 +--- 3 files changed, 76 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ffdf59..de635df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,20 +48,13 @@ dependencies = [ [[package]] name = "ahash" -version = "0.3.8" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877" dependencies = [ - "const-random", -] - -[[package]] -name = "ahash" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c" -dependencies = [ - "const-random", + "getrandom 0.2.0", + "once_cell", + "version_check", ] [[package]] @@ -281,28 +274,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "const-random" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486d435a7351580347279f374cb8a3c16937485441db80181357b7c4d70f17ed" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a84d8ff70e3ec52311109b019c27672b4c1929e4cf7c18bcf0cd9fb5e230be" -dependencies = [ - "getrandom 0.2.0", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -333,12 +304,12 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "crossbeam-utils", - "maybe-uninit", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.3", ] [[package]] @@ -353,10 +324,15 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.2" +name = "crossbeam-utils" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "lazy_static", +] [[package]] name = "crypto-mac" @@ -370,15 +346,14 @@ dependencies = [ [[package]] name = "cursive" -version = "0.15.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9f12332ab2bca26979ef00cfef9a1c2e287db03b787a83d892ad9961f81374" +checksum = "6593c3409eb794bf22090bec60dda1e19d1def284478bec7e5a92da3cf977c52" dependencies = [ - "ahash 0.3.8", - "cfg-if 0.1.10", + "ahash", + "cfg-if 1.0.0", "crossbeam-channel", "cursive_core", - "enumset", "lazy_static", "libc", "log", @@ -386,48 +361,50 @@ dependencies = [ "termion", "unicode-segmentation", "unicode-width", + "wasmer_enumset", ] [[package]] name = "cursive_buffered_backend" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75baaba7a90dc9d2f94693f28a299a652d3b8a21f49707ff5f8a2114244d4522" +checksum = "8ff406fcf5a4dd60b55c619704833346dec67af7f2545e4ad96f26777d8bdbcf" dependencies = [ "cursive_core", - "enumset", "log", "smallvec", "unicode-segmentation", "unicode-width", + "wasmer_enumset", ] [[package]] name = "cursive_core" -version = "0.1.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fc5b6a8ba2f1bc743892068bde466438f78d6247197e2dc094bfd53fdea4b7" +checksum = "025ac0bcd21ced752d27b70e6aa2285a3513d07b5a0c7f89e71121d20ca1429d" dependencies = [ - "ahash 0.4.6", + "ahash", "chrono", "crossbeam-channel", "enum-map", - "enumset", "lazy_static", "libc", "log", "num", "owning_ref", - "signal-hook", + "syn", "unicode-segmentation", "unicode-width", + "wasmer_enumset", "xi-unicode", ] [[package]] name = "cursive_table_view" -version = "0.12.0" -source = "git+https://github.com/BonsaiDen/cursive_table_view.git#e422cf7e4be36ae3446793127eb5737d20776b64" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d378a3626928480ca02040934e145991f6256318891c1eb7c48a502321f0cc" dependencies = [ "cursive_core", ] @@ -526,28 +503,6 @@ dependencies = [ "syn", ] -[[package]] -name = "enumset" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959a80a2062fedd66ed41d99736212de987b3a8c83a4c2cef243968075256bd1" -dependencies = [ - "enumset_derive", - "num-traits", -] - -[[package]] -name = "enumset_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74bef436ac71820c5cf768d7af9ba33121246b09a00e09a55d94ef8095a875ac" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "failure" version = "0.1.8" @@ -943,12 +898,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.3.4" @@ -1300,12 +1249,6 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.24" @@ -1446,7 +1389,7 @@ dependencies = [ "base64 0.12.3", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -1502,18 +1445,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -1522,9 +1465,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.59" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -1558,9 +1501,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.1.16" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" +checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac" dependencies = [ "libc", "signal-hook-registry", @@ -1568,9 +1511,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" dependencies = [ "libc", ] @@ -1619,9 +1562,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" [[package]] name = "syn" -version = "1.0.50" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443b4178719c5a851e1bde36ce12da21d74a0e60b4d982ec3385a933c812f0f6" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2", "quote", @@ -1686,15 +1629,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.1.0" @@ -1994,6 +1928,28 @@ dependencies = [ "quote", ] +[[package]] +name = "wasmer_enumset" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8" +dependencies = [ + "num-traits", + "wasmer_enumset_derive", +] + +[[package]] +name = "wasmer_enumset_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "web-sys" version = "0.3.45" @@ -2078,6 +2034,6 @@ dependencies = [ [[package]] name = "xi-unicode" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e71b85d8b1b8bfaf4b5c834187554d201a8cd621c2bbfa33efd41a3ecabd48b2" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" diff --git a/Cargo.toml b/Cargo.toml index 0b05ab7..e6f5a5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,23 +11,21 @@ description = "terminal-based vault browser for bitwarden" [dependencies] clipboard = "0.5.0" -cursive_buffered_backend = "0.4.1" +cursive_buffered_backend = "0.5.0" +cursive_table_view = "0.13.3" directories = "3.0.1" fuzzy-matcher = "0.3.7" -serde_json = "1.0.59" +serde_json = "1.0.64" unicase = "2.6.0" [dependencies.bitwarden] path = "bitwarden" [dependencies.cursive] -version = "0.15.0" +version = "0.16.3" default-features = false features = ["termion-backend"] -[dependencies.cursive_table_view] -git = "https://github.com/BonsaiDen/cursive_table_view.git" - [dependencies.serde] -version = "1.0.117" +version = "1.0.125" features = ["derive"] diff --git a/src/main.rs b/src/main.rs index 3c1e110..0db1760 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,18 +3,8 @@ mod login; mod vault; -use cursive::backends::termion::Backend; -use cursive::Cursive; -use cursive_buffered_backend::BufferedBackend; - fn main() { - // We need to use a buffered backend due to flickering with termion. - let mut siv = Cursive::new(|| { - let backend = Backend::init().unwrap(); - let buffered = BufferedBackend::new(backend); - - Box::new(buffered) - }); + let mut siv = cursive::default(); if let Ok(vault) = vault::read_local_data() { siv.set_user_data(vault);