From cefe46a0bfe4b098dfb06bb72691c192c5867e8e Mon Sep 17 00:00:00 2001 From: HoLLy Date: Mon, 24 Jul 2023 20:48:52 +0200 Subject: [PATCH] Update dependencies --- Cargo.lock | 110 ++++++++++++++++++++++--------------- td-tui/Cargo.toml | 2 +- td-tui/src/ui/constants.rs | 23 ++++++++ 3 files changed, 89 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5feabb..7f9f955 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,6 +20,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "cassowary" version = "0.3.0" @@ -38,7 +44,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -65,15 +71,15 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "fixedbitset" @@ -124,6 +130,12 @@ dependencies = [ "hashbrown 0.14.0", ] +[[package]] +name = "indoc" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" + [[package]] name = "itertools" version = "0.10.5" @@ -135,15 +147,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" @@ -214,6 +226,12 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "petgraph" version = "0.6.3" @@ -251,18 +269,18 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "proc-macro2" -version = "1.0.61" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a6f739a0c0addeaf6ed75150b95743aa18643a3c6f40409ed7b6db3a6911f" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -299,13 +317,15 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce841e0486e7c2412c3740168ede33adeba8e154a15107b879d8162d77c7174e" +checksum = "8285baa38bdc9f879d92c0e37cb562ef38aa3aeefca22b3200186bc39242d3d5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "cassowary", "crossterm", + "indoc", + "paste", "unicode-segmentation", "unicode-width", ] @@ -316,35 +336,35 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" dependencies = [ "proc-macro2", "quote", @@ -353,9 +373,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "indexmap 2.0.0", "itoa", @@ -365,9 +385,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -395,15 +415,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" -version = "2.0.21" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1182caafaab7018eaea9b404afa8184c0baf42a04d5e10ae4f4843c2029c8aab" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -451,18 +471,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", @@ -471,9 +491,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "libc", @@ -491,9 +511,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -510,9 +530,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-segmentation" @@ -565,9 +585,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", diff --git a/td-tui/Cargo.toml b/td-tui/Cargo.toml index 0e667c6..14ab589 100644 --- a/td-tui/Cargo.toml +++ b/td-tui/Cargo.toml @@ -14,5 +14,5 @@ predicates = { version = "3", default-features = false } td-lib = { path = "../td-lib" } td-util = { path = "../td-util" } textwrap = { version = "0.16", default-features = false } -ratatui = "0.21" +ratatui = "0.22" tui-input = "0.7" diff --git a/td-tui/src/ui/constants.rs b/td-tui/src/ui/constants.rs index 528010d..b15e565 100644 --- a/td-tui/src/ui/constants.rs +++ b/td-tui/src/ui/constants.rs @@ -10,6 +10,7 @@ pub const NO_STYLE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const FG_WHITE: Style = Style { @@ -17,6 +18,7 @@ pub const FG_WHITE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const FG_LIGHT: Style = Style { @@ -24,6 +26,7 @@ pub const FG_LIGHT: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const FG_DIM: Style = Style { @@ -31,6 +34,7 @@ pub const FG_DIM: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const FG_GREEN: Style = Style { @@ -38,6 +42,7 @@ pub const FG_GREEN: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const FG_RED: Style = Style { @@ -45,6 +50,7 @@ pub const FG_RED: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const BOLD: Style = Style { @@ -52,6 +58,7 @@ pub const BOLD: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const ITALIC: Style = Style { @@ -59,6 +66,7 @@ pub const ITALIC: Style = Style { bg: None, add_modifier: Modifier::ITALIC, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const TEXT: Style = Style { @@ -66,6 +74,7 @@ pub const TEXT: Style = Style { bg: Some(Color::Black), add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const TEXT_INVERTED: Style = Style { @@ -73,6 +82,7 @@ pub const TEXT_INVERTED: Style = Style { bg: Some(Color::White), add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const SETTINGS_HEADER: Style = Style { @@ -80,6 +90,7 @@ pub const SETTINGS_HEADER: Style = Style { bg: None, add_modifier: Modifier::UNDERLINED, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const STARTED_TASK: Style = Style { @@ -87,6 +98,7 @@ pub const STARTED_TASK: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const COMPLETED_TASK: Style = Style { @@ -94,6 +106,7 @@ pub const COMPLETED_TASK: Style = Style { bg: None, add_modifier: Modifier::ITALIC.union(Modifier::CROSSED_OUT), sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for unselected list items @@ -102,6 +115,7 @@ pub const LIST_STYLE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for selected list items @@ -110,12 +124,14 @@ pub const LIST_HIGHLIGHT_STYLE: Style = Style { bg: Some(ACCENT_COLOR), add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const LIST_HIGHLIGHT_STYLE_DISABLED: Style = Style { fg: Some(Color::Black), bg: Some(Color::DarkGray), add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for unselected tabs @@ -124,6 +140,7 @@ pub const TAB_STYLE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for selected tabs @@ -132,6 +149,7 @@ pub const TAB_HIGHLIGHT_STYLE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for a textbox without background @@ -140,6 +158,7 @@ pub const TEXTBOX_STYLE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; /// The style for a textbox with a background @@ -148,6 +167,7 @@ pub const TEXTBOX_STYLE_BG: Style = Style { bg: Some(Color::DarkGray), add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const KEYBINDS_TEXT_ACTIVE: Style = Style { @@ -155,6 +175,7 @@ pub const KEYBINDS_TEXT_ACTIVE: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const KEYBINDS_TEXT_INACTIVE: Style = Style { @@ -162,6 +183,7 @@ pub const KEYBINDS_TEXT_INACTIVE: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), + underline_color: None, }; pub const KEYBINDS_CHAR_ACTIVE: Style = Style { @@ -169,6 +191,7 @@ pub const KEYBINDS_CHAR_ACTIVE: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), + underline_color: None, }; pub const KEYBINDS_CHAR_INACTIVE: Style = KEYBINDS_TEXT_INACTIVE;