From ed6ef1f690dc9906311a63b28d41602b17f641f7 Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Tue, 19 Jan 2021 10:53:40 -0800 Subject: Update to cursive 0.16 --- Cargo.lock | 167 +++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- src/tui/markdown.rs | 2 +- 3 files changed, 81 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c18f04..4ec2cfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,20 +8,13 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" -dependencies = [ - "const-random", + "getrandom 0.2.1", + "once_cell", + "version_check", ] [[package]] @@ -198,28 +191,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.1", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - [[package]] name = "const_fn" version = "0.4.5" @@ -418,13 +389,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" dependencies = [ "bitflags", - "crossterm_winapi", + "crossterm_winapi 0.6.2", "futures-util", "lazy_static", "libc", "mio", "parking_lot 0.10.2", - "signal-hook", + "signal-hook 0.1.17", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" +dependencies = [ + "bitflags", + "crossterm_winapi 0.7.0", + "lazy_static", + "libc", + "mio", + "parking_lot 0.11.1", + "signal-hook 0.1.17", "winapi", ] @@ -438,10 +425,13 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.2" +name = "crossterm_winapi" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" +dependencies = [ + "winapi", +] [[package]] name = "cssparser" @@ -494,49 +484,49 @@ 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", - "crossbeam-channel 0.4.4", - "crossterm", + "ahash", + "cfg-if 1.0.0", + "crossbeam-channel 0.5.0", + "crossterm 0.19.0", "cursive_core", - "enumset", "lazy_static", "libc", "log", "maplit", "ncurses", "pancurses", - "signal-hook", + "signal-hook 0.3.4", "term_size", "termion", "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.7", + "ahash", "chrono", - "crossbeam-channel 0.4.4", + "crossbeam-channel 0.5.0", "enum-map", - "enumset", "lazy_static", "libc", "log", "num", "owning_ref", - "signal-hook", + "syn", "toml", "unicode-segmentation", "unicode-width", + "wasmer_enumset", "xi-unicode", ] @@ -664,28 +654,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 = "flate2" version = "1.0.19" @@ -2094,6 +2062,16 @@ dependencies = [ "signal-hook-registry", ] +[[package]] +name = "signal-hook" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780f5e3fe0c66f67197236097d89de1e86216f1f6fdeaf47c442f854ab46c240" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.3.0" @@ -2127,7 +2105,7 @@ version = "0.4.3" dependencies = [ "clap", "criterion", - "crossterm", + "crossterm 0.17.7", "cursive", "directories", "futures", @@ -2254,7 +2232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4fae9923b92f150e76725c2b25d07767154baa597825870cc1e418ce9262dab" dependencies = [ "crossbeam", - "crossterm", + "crossterm 0.17.7", "lazy_static", "minimad", "thiserror", @@ -2318,15 +2296,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinytemplate" version = "1.2.0" @@ -2652,6 +2621,28 @@ version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +[[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.46" @@ -2713,9 +2704,9 @@ 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" [[package]] name = "yaml-rust" diff --git a/Cargo.toml b/Cargo.toml index cf1ec03..a12809d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ pulldown-cmark = { version = "0.7", default-features = false } syn = "=1.0.57" [dependencies.cursive] -version = "0.15" +version = "0.16" default-features = false features = ["toml"] diff --git a/src/tui/markdown.rs b/src/tui/markdown.rs index 49c36db..9b03dde 100644 --- a/src/tui/markdown.rs +++ b/src/tui/markdown.rs @@ -65,7 +65,7 @@ pub fn preview(width: usize, input: &StyledString) -> StyledString { fn drop_color(span: StyledIndexedSpan) -> StyledIndexedSpan { IndexedSpan { attr: Style { - color: None, + color: Default::default(), ..span.attr }, ..span -- cgit v1.2.3