From c72f059e2345c158d0a2bdf8d8051d4f6bcc9cb8 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 11 May 2023 12:10:33 +0200 Subject: switch to ratatui --- Cargo.lock | 90 ++++++++++++++++++++++++++++++++------------------------------ Cargo.toml | 8 +++--- 2 files changed, 51 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 254b0f7..4fabbf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", @@ -250,13 +250,13 @@ dependencies = [ [[package]] name = "crosstermion" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99aabd9b02c2d5f72697f30ffb46f5a9ff4bd240d826049892cf62c31daeed04" +checksum = "152ef46d620d4614070109e076ffc6ab032f682a380ac2efce412100c5ee7749" dependencies = [ "crossterm", + "ratatui", "termion", - "tui", "tui-react", ] @@ -295,8 +295,8 @@ dependencies = [ "parking_lot", "petgraph", "pretty_assertions", + "ratatui", "trash", - "tui", "tui-react", "unicode-segmentation", "wild", @@ -426,6 +426,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + [[package]] name = "is-terminal" version = "0.4.7" @@ -438,6 +447,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + [[package]] name = "itertools" version = "0.10.5" @@ -566,12 +585,12 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "open" -version = "3.2.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +checksum = "d16814a067484415fda653868c9be0ac5f2abd2ef5d951082a5f2fe1b3662944" dependencies = [ + "is-wsl", "pathdiff", - "windows-sys 0.42.0", ] [[package]] @@ -664,6 +683,20 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ratatui" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcc0d032bccba900ee32151ec0265667535c230169f5a011154cdcd984e16829" +dependencies = [ + "bitflags", + "cassowary", + "crossterm", + "termion", + "unicode-segmentation", + "unicode-width", +] + [[package]] name = "rayon" version = "1.7.0" @@ -796,9 +829,9 @@ dependencies = [ [[package]] name = "termion" -version = "1.5.6" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +checksum = "659c1f379f3408c7e5e84c7d0da6d93404e3800b6b9d063ba24436419302ec90" dependencies = [ "libc", "numtoa", @@ -836,28 +869,14 @@ dependencies = [ "windows", ] -[[package]] -name = "tui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags", - "cassowary", - "crossterm", - "termion", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "tui-react" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542c37309aaf01ddaea86891f7845a8b0124194c6ccae6dbae7d223752648f4d" +checksum = "11f13a7edfda102bf2bc3f9c1714904c961d513ebf4ae0c09decc4f17340f9a7" dependencies = [ "log", - "tui", + "ratatui", "unicode-segmentation", "unicode-width", ] @@ -964,21 +983,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index 5853770..b907b41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,10 +33,10 @@ trash = { version = "3.0.0", optional = true, default-features = false, features # 'tui' related unicode-segmentation = { version = "1.3.0", optional = true } -crosstermion = { version = "0.10.1", default-features = false, optional = true } -tui = { version = "0.19.0", optional = true, default-features = false } -tui-react = { version = "0.19.0", optional = true } -open = { version = "3.0", optional = true } +crosstermion = { version = "0.11.0", default-features = false, optional = true } +tui = { package = "ratatui", version = "0.20.1", optional = true, default-features = false } +tui-react = { version = "0.20.0", optional = true } +open = { version = "4.1.0", optional = true } wild = "2.0.4" owo-colors = "3.5.0" -- cgit v1.2.3