From d66e1a8c54a646f1aef665091642d5d11915bd00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:34:53 +0000 Subject: [PATCH] chore(deps)!: bump ratatui from 0.23.0 to 0.24.0 Updates breaking changes from ratatui: - `Frame` - bump the MSRV to `1.70.0` Bumps [ratatui](https://github.com/ratatui-org/ratatui) from 0.23.0 to 0.24.0. - [Release notes](https://github.com/ratatui-org/ratatui/releases) - [Changelog](https://github.com/ratatui-org/ratatui/blob/main/CHANGELOG.md) - [Commits](https://github.com/ratatui-org/ratatui/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: ratatui dependency-type: direct:production update-type: version-update:semver-minor ... --- .deny.toml | 4 +- .justfile | 2 +- Cargo.lock | 72 ++++++++++++++++++++++++++++++++-- Cargo.toml | 4 +- examples/long_running.rs | 2 +- examples/nested_shell.rs | 2 +- examples/nested_shell_async.rs | 2 +- examples/simple_ls_chan.rs | 2 +- examples/simple_ls_rw.rs | 2 +- 9 files changed, 79 insertions(+), 13 deletions(-) diff --git a/.deny.toml b/.deny.toml index bf92e28..970e471 100644 --- a/.deny.toml +++ b/.deny.toml @@ -79,6 +79,7 @@ allow = [ "MIT", "Apache-2.0", "Unicode-DFS-2016", + "BSD-2-Clause", # "WTFPL", # "AGPL-3.0", #"Apache-2.0 WITH LLVM-exception", @@ -203,7 +204,8 @@ unknown-git = "warn" # if not specified. If it is specified but empty, no registries are allowed. allow-registry = ["https://github.com/rust-lang/crates.io-index"] # List of URLs for allowed Git repositories -allow-git = [] +allow-git = [ "git+https://github.com/sigaloid/iai?rev=6c83e942#6c83e9429b86290f88d6ff30ca6c0d6014b5a5f3" +] [sources.allow-org] # 1 or more github.com organizations to allow git sources for diff --git a/.justfile b/.justfile index 8307ce1..84e1ba4 100644 --- a/.justfile +++ b/.justfile @@ -37,7 +37,7 @@ cargo-diff: lint: nix develop .#lintShell --command cargo diet - nix develop .#lintShell --command cargo deny check licenses + nix develop .#lintShell --command cargo deny check licenses sources nix develop .#lintShell --command typos nix develop .#lintShell --command lychee *.md nix develop .#fmtShell --command treefmt --fail-on-change diff --git a/Cargo.lock b/Cargo.lock index ac03ff3..c0c96a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,18 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.0.2" @@ -26,6 +38,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "anes" version = "0.1.6" @@ -349,6 +367,16 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash", + "allocator-api2", +] + [[package]] name = "heck" version = "0.4.1" @@ -481,6 +509,15 @@ version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +[[package]] +name = "lru" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +dependencies = [ + "hashbrown", +] + [[package]] name = "memchr" version = "2.5.0" @@ -706,15 +743,16 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" dependencies = [ "bitflags 2.3.3", "cassowary", "crossterm", "indoc", "itertools 0.11.0", + "lru", "paste", "strum", "unicode-segmentation", @@ -1001,9 +1039,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -1194,6 +1232,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "vt100" version = "0.15.2" @@ -1487,3 +1531,23 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index 3006426..6a30a41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ documentation = "https://docs.rs/tui-term/latest/tui-term/" repository = "https://github.com/a-kenji/tui-term" autoexamples = true -rust-version = "1.67.0" +rust-version = "1.70.0" keywords = ["tui", "terminal", "ratatui", "tty", "multiplexer"] @@ -33,7 +33,7 @@ categories = ["command-line-interface", "command-line-utilities"] # ] [dependencies] -ratatui = "0.23.0" +ratatui = "0.24.0" vt100 = "0.15.2" [dev-dependencies] diff --git a/examples/long_running.rs b/examples/long_running.rs index 89497fb..15b6926 100644 --- a/examples/long_running.rs +++ b/examples/long_running.rs @@ -119,7 +119,7 @@ fn run( } } -fn ui(f: &mut Frame, screen: &Screen) { +fn ui(f: &mut Frame, screen: &Screen) { let chunks = ratatui::layout::Layout::default() .direction(ratatui::layout::Direction::Vertical) .margin(1) diff --git a/examples/nested_shell.rs b/examples/nested_shell.rs index 936aeae..5cf0573 100644 --- a/examples/nested_shell.rs +++ b/examples/nested_shell.rs @@ -186,7 +186,7 @@ fn run( } } -fn ui(f: &mut Frame, screen: &Screen) { +fn ui(f: &mut Frame, screen: &Screen) { let chunks = ratatui::layout::Layout::default() .direction(ratatui::layout::Direction::Vertical) .margin(1) diff --git a/examples/nested_shell_async.rs b/examples/nested_shell_async.rs index 1da3eeb..a0902ad 100644 --- a/examples/nested_shell_async.rs +++ b/examples/nested_shell_async.rs @@ -194,7 +194,7 @@ async fn run( } } -fn ui(f: &mut Frame, screen: &Screen) { +fn ui(f: &mut Frame, screen: &Screen) { let chunks = ratatui::layout::Layout::default() .direction(ratatui::layout::Direction::Vertical) .margin(1) diff --git a/examples/simple_ls_chan.rs b/examples/simple_ls_chan.rs index 15c30b9..5d269e5 100644 --- a/examples/simple_ls_chan.rs +++ b/examples/simple_ls_chan.rs @@ -84,7 +84,7 @@ fn run(terminal: &mut Terminal, screen: &Screen) -> io::Result<() } } -fn ui(f: &mut Frame, screen: &Screen) { +fn ui(f: &mut Frame, screen: &Screen) { let chunks = ratatui::layout::Layout::default() .direction(ratatui::layout::Direction::Vertical) .margin(1) diff --git a/examples/simple_ls_rw.rs b/examples/simple_ls_rw.rs index 226d847..202154d 100644 --- a/examples/simple_ls_rw.rs +++ b/examples/simple_ls_rw.rs @@ -92,7 +92,7 @@ fn run( } } -fn ui(f: &mut Frame, screen: &Screen) { +fn ui(f: &mut Frame, screen: &Screen) { let chunks = ratatui::layout::Layout::default() .direction(ratatui::layout::Direction::Vertical) .margin(1)