From 1ed475d5674bab13d83810cf94a1e031ba493dde Mon Sep 17 00:00:00 2001 From: Josh McKinney Date: Fri, 23 Aug 2024 11:54:29 -0700 Subject: [PATCH] Update ratatui to 0.28.0 and all other dependencies --- Cargo.lock | 384 ++++++++++++++++---------- component-generated/Cargo.toml | 42 +-- component-generated/build.rs | 17 +- component-generated/src/app.rs | 2 +- component-generated/src/components.rs | 7 +- component/template/Cargo.toml | 43 +-- component/template/build.rs | 17 +- component/template/src/app.rs | 2 +- component/template/src/components.rs | 7 +- simple-async-generated/Cargo.toml | 6 +- simple-async-generated/src/lib.rs | 14 - simple-async-generated/src/main.rs | 21 +- simple-async-generated/src/ui.rs | 2 +- simple-async/Cargo.toml | 6 +- simple-async/src/lib.rs | 14 - simple-async/src/main.rs | 21 +- simple-async/src/ui.rs | 2 +- simple-generated/Cargo.toml | 2 +- simple-generated/src/lib.rs | 14 - simple-generated/src/main.rs | 21 +- simple-generated/src/ui.rs | 2 +- simple/Cargo.toml | 2 +- simple/src/lib.rs | 14 - simple/src/main.rs | 21 +- simple/src/ui.rs | 2 +- 25 files changed, 397 insertions(+), 288 deletions(-) delete mode 100644 simple-async-generated/src/lib.rs delete mode 100644 simple-async/src/lib.rs delete mode 100644 simple-generated/src/lib.rs delete mode 100644 simple/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 33056ce..6d5da52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -132,7 +138,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -153,12 +159,6 @@ dependencies = [ "console", ] -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" @@ -194,38 +194,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "cassowary" version = "0.3.0" @@ -337,13 +305,14 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "compact_str" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" dependencies = [ "castaway", "cfg-if", "itoa", + "rustversion", "ryu", "serde", "static_assertions", @@ -353,6 +322,7 @@ dependencies = [ name = "component-generated" version = "0.1.0" dependencies = [ + "anyhow", "better-panic", "clap", "color-eyre", @@ -378,6 +348,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "vergen", + "vergen-gix", ] [[package]] @@ -461,16 +432,16 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.6.0", + "bitflags", "crossterm_winapi", "futures-core", - "libc", - "mio 0.8.11", + "mio", "parking_lot", + "rustix", "serde", "signal-hook", "signal-hook-mio", @@ -502,6 +473,41 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.72", +] + [[package]] name = "deranged" version = "0.3.11" @@ -511,6 +517,37 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.72", +] + [[package]] name = "derive_deref" version = "1.1.1" @@ -570,9 +607,9 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "either" @@ -626,24 +663,24 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -771,6 +808,18 @@ dependencies = [ "wasi", ] +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "gimli" version = "0.28.1" @@ -888,11 +937,11 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.14.7" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b328997d74dd15dc71b2773b162cb4af9a25c424105e4876e6d0686ab41c383e" +checksum = "03f76169faa0dec598eac60f83d7fcdd739ec16596eca8fb144c88973dbe6f8c" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "gix-path", "libc", @@ -960,9 +1009,9 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adf99c27cdf17b1c4d77680c917e0d94d8783d4e1c73d3be0d1d63107163d7a" +checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575" dependencies = [ "fastrand", "gix-features", @@ -971,11 +1020,11 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7df15afa265cc8abe92813cd354d522f1ac06b29ec6dfa163ad320575cb447" +checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "gix-features", "gix-path", @@ -1008,7 +1057,7 @@ version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a9a44eb55bd84bb48f8a44980e951968ced21e171b22d115d1cdcef82a7d73f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "filetime", "fnv", @@ -1111,9 +1160,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" +checksum = "38d5b8722112fa2fa87135298780bc833b0e9f6c56cc82795d209804b3a03484" dependencies = [ "bstr", "gix-trace", @@ -1202,11 +1251,11 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1547d26fa5693a7f34f05b4a3b59a90890972922172653bcb891ab3f09f436df" +checksum = "0fe4d52f30a737bbece5276fab5d3a8b276dc2650df963e293d0673be34e7a5f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "gix-path", "libc", "windows-sys 0.52.0", @@ -1214,9 +1263,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "14.0.1" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c" +checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa" dependencies = [ "gix-fs", "libc", @@ -1239,7 +1288,7 @@ version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840" dependencies = [ - "bitflags 2.6.0", + "bitflags", "gix-commitgraph", "gix-date", "gix-hash", @@ -1252,9 +1301,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.27.4" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156" +checksum = "fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89" dependencies = [ "bstr", "gix-features", @@ -1323,9 +1372,9 @@ dependencies = [ [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a" dependencies = [ "anstream", "anstyle", @@ -1337,6 +1386,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1363,6 +1418,16 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "instability" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +dependencies = [ + "quote", + "syn 2.0.72", +] + [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -1403,9 +1468,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libredox" @@ -1413,8 +1478,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", + "redox_syscall", ] [[package]] @@ -1494,15 +1560,12 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.11" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", + "adler2", ] [[package]] @@ -1513,6 +1576,7 @@ checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ "hermit-abi", "libc", + "log", "wasi", "windows-sys 0.52.0", ] @@ -1624,7 +1688,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -1720,6 +1784,30 @@ dependencies = [ "yansi", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -1746,19 +1834,19 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" +checksum = "5ba6a365afbe5615999275bea2446b970b10a41102500e27ce7678d50d978303" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cassowary", "compact_str", "crossterm", + "instability", "itertools", "lru", "paste", "serde", - "stability", "strum", "strum_macros", "unicode-segmentation", @@ -1766,22 +1854,13 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -1846,7 +1925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.6.0", + "bitflags", "serde", "serde_derive", ] @@ -1873,7 +1952,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -1907,29 +1986,20 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - [[package]] name = "serde" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -1938,11 +2008,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1994,12 +2065,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", + "mio", "signal-hook", ] @@ -2054,16 +2125,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "stability" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" -dependencies = [ - "quote", - "syn 2.0.72", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -2131,14 +2192,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2240,14 +2302,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.1" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -2491,17 +2553,42 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vergen" -version = "8.3.2" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" dependencies = [ "anyhow", - "cargo_metadata", - "cfg-if", + "derive_builder", + "rustversion", + "time", + "vergen-lib", +] + +[[package]] +name = "vergen-gix" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf11588e10333838eeb5b0d341e3364dfc1bfaf7c1b3beccf8f8706c49d5d34" +dependencies = [ + "anyhow", + "derive_builder", "gix", - "regex", "rustversion", "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" +dependencies = [ + "anyhow", + "derive_builder", + "getset", + "rustversion", ] [[package]] @@ -2564,9 +2651,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ "windows-sys 0.52.0", ] @@ -2595,6 +2682,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/component-generated/Cargo.toml b/component-generated/Cargo.toml index 400f6b3..77819ba 100644 --- a/component-generated/Cargo.toml +++ b/component-generated/Cargo.toml @@ -3,7 +3,6 @@ name = "component-generated" version = "0.1.0" edition = "2021" description = "An example generated using the component template" - authors = ["Josh McKinney "] build = "build.rs" @@ -11,29 +10,38 @@ build = "build.rs" [dependencies] better-panic = "0.3.0" -clap = { version = "4.4.5", features = ["derive", "cargo", "wrap_help", "unicode", "string", "unstable-styles"] } -color-eyre = "0.6.2" +clap = { version = "4.4.5", features = [ + "derive", + "cargo", + "wrap_help", + "unicode", + "string", + "unstable-styles", +] } +color-eyre = "0.6.3" config = "0.14.0" -crossterm = { version = "0.27.0", features = ["serde", "event-stream"] } +crossterm = { version = "0.28.1", features = ["serde", "event-stream"] } derive_deref = "1.1.1" directories = "5.0.1" -futures = "0.3.28" -human-panic = "1.2.0" +futures = "0.3.30" +human-panic = "2.0.1" json5 = "0.4.1" -lazy_static = "1.4.0" -libc = "0.2.148" +lazy_static = "1.5.0" +libc = "0.2.158" pretty_assertions = "1.4.0" -ratatui = { version = "0.27.0", features = ["serde", "macros"] } -serde = { version = "1.0.188", features = ["derive"] } -serde_json = "1.0.107" +ratatui = { version = "0.28.0", features = ["serde", "macros"] } +serde = { version = "1.0.208", features = ["derive"] } +serde_json = "1.0.125" signal-hook = "0.3.17" strip-ansi-escapes = "0.2.0" -strum = { version = "0.26.1", features = ["derive"] } -tokio = { version = "1.32.0", features = ["full"] } -tokio-util = "0.7.9" -tracing = "0.1.37" +strum = { version = "0.26.3", features = ["derive"] } +tokio = { version = "1.39.3", features = ["full"] } +tokio-util = "0.7.11" +tracing = "0.1.40" tracing-error = "0.2.0" -tracing-subscriber = { version = "0.3.17", features = ["env-filter", "serde"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde"] } [build-dependencies] -vergen = { version = "8.2.6", features = [ "build", "git", "gitoxide", "cargo" ]} +anyhow = "1.0.86" +vergen = { version = "9.0.0", features = ["build"] } +vergen-gix = "1.0.0" diff --git a/component-generated/build.rs b/component-generated/build.rs index c67712f..53cbf8b 100644 --- a/component-generated/build.rs +++ b/component-generated/build.rs @@ -1,7 +1,12 @@ -fn main() -> Result<(), Box> { - vergen::EmitBuilder::builder() - .all_build() - .all_git() - .emit()?; - Ok(()) +use anyhow::Result; +use vergen::{BuildBuilder, Emitter}; +use vergen_gix::GixBuilder; + +fn main() -> Result<()> { + let build = BuildBuilder::all_build()?; + let gix = GixBuilder::all_git()?; + Emitter::default() + .add_instructions(&build)? + .add_instructions(&gix)? + .emit() } diff --git a/component-generated/src/app.rs b/component-generated/src/app.rs index 0dc6ae3..951ca7b 100644 --- a/component-generated/src/app.rs +++ b/component-generated/src/app.rs @@ -165,7 +165,7 @@ impl App { fn render(&mut self, tui: &mut Tui) -> Result<()> { tui.draw(|frame| { for component in self.components.iter_mut() { - if let Err(err) = component.draw(frame, frame.size()) { + if let Err(err) = component.draw(frame, frame.area()) { let _ = self .action_tx .send(Action::Error(format!("Failed to draw: {:?}", err))); diff --git a/component-generated/src/components.rs b/component-generated/src/components.rs index 3537b9f..84c12c9 100644 --- a/component-generated/src/components.rs +++ b/component-generated/src/components.rs @@ -1,6 +1,9 @@ use color_eyre::Result; use crossterm::event::{KeyEvent, MouseEvent}; -use ratatui::{layout::Rect, Frame}; +use ratatui::{ + layout::{Rect, Size}, + Frame, +}; use tokio::sync::mpsc::UnboundedSender; use crate::{action::Action, config::Config, tui::Event}; @@ -48,7 +51,7 @@ pub trait Component { /// # Returns /// /// * `Result<()>` - An Ok result or an error. - fn init(&mut self, area: Rect) -> Result<()> { + fn init(&mut self, area: Size) -> Result<()> { let _ = area; // to appease clippy Ok(()) } diff --git a/component/template/Cargo.toml b/component/template/Cargo.toml index b5be9b3..7a3e910 100644 --- a/component/template/Cargo.toml +++ b/component/template/Cargo.toml @@ -3,37 +3,46 @@ name = "{{project-name | kebab_case}}" version = "0.1.0" edition = "2021" description = "{{project-description}}" -{% if repository != "" %}repository = "{{repository}}"{% endif %} authors = ["{{authors}}"] build = "build.rs" +{%- if repository != "" %}repository = "{{repository}}"{% endif %} # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] better-panic = "0.3.0" -clap = { version = "4.4.5", features = ["derive", "cargo", "wrap_help", "unicode", "string", "unstable-styles"] } -color-eyre = "0.6.2" +clap = { version = "4.4.5", features = [ + "derive", + "cargo", + "wrap_help", + "unicode", + "string", + "unstable-styles", +] } +color-eyre = "0.6.3" config = "0.14.0" -crossterm = { version = "0.27.0", features = ["serde", "event-stream"] } +crossterm = { version = "0.28.1", features = ["serde", "event-stream"] } derive_deref = "1.1.1" directories = "5.0.1" -futures = "0.3.28" -human-panic = "1.2.0" +futures = "0.3.30" +human-panic = "2.0.1" json5 = "0.4.1" -lazy_static = "1.4.0" -libc = "0.2.148" +lazy_static = "1.5.0" +libc = "0.2.158" pretty_assertions = "1.4.0" -ratatui = { version = "0.27.0", features = ["serde", "macros"] } -serde = { version = "1.0.188", features = ["derive"] } -serde_json = "1.0.107" +ratatui = { version = "0.28.0", features = ["serde", "macros"] } +serde = { version = "1.0.208", features = ["derive"] } +serde_json = "1.0.125" signal-hook = "0.3.17" strip-ansi-escapes = "0.2.0" -strum = { version = "0.26.1", features = ["derive"] } -tokio = { version = "1.32.0", features = ["full"] } -tokio-util = "0.7.9" -tracing = "0.1.37" +strum = { version = "0.26.3", features = ["derive"] } +tokio = { version = "1.39.3", features = ["full"] } +tokio-util = "0.7.11" +tracing = "0.1.40" tracing-error = "0.2.0" -tracing-subscriber = { version = "0.3.17", features = ["env-filter", "serde"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde"] } [build-dependencies] -vergen = { version = "8.2.6", features = [ "build", "git", "gitoxide", "cargo" ]} +anyhow = "1.0.86" +vergen = { version = "9.0.0", features = ["build"] } +vergen-gix = "1.0.0" diff --git a/component/template/build.rs b/component/template/build.rs index c67712f..53cbf8b 100644 --- a/component/template/build.rs +++ b/component/template/build.rs @@ -1,7 +1,12 @@ -fn main() -> Result<(), Box> { - vergen::EmitBuilder::builder() - .all_build() - .all_git() - .emit()?; - Ok(()) +use anyhow::Result; +use vergen::{BuildBuilder, Emitter}; +use vergen_gix::GixBuilder; + +fn main() -> Result<()> { + let build = BuildBuilder::all_build()?; + let gix = GixBuilder::all_git()?; + Emitter::default() + .add_instructions(&build)? + .add_instructions(&gix)? + .emit() } diff --git a/component/template/src/app.rs b/component/template/src/app.rs index 0dc6ae3..951ca7b 100644 --- a/component/template/src/app.rs +++ b/component/template/src/app.rs @@ -165,7 +165,7 @@ impl App { fn render(&mut self, tui: &mut Tui) -> Result<()> { tui.draw(|frame| { for component in self.components.iter_mut() { - if let Err(err) = component.draw(frame, frame.size()) { + if let Err(err) = component.draw(frame, frame.area()) { let _ = self .action_tx .send(Action::Error(format!("Failed to draw: {:?}", err))); diff --git a/component/template/src/components.rs b/component/template/src/components.rs index 3537b9f..84c12c9 100644 --- a/component/template/src/components.rs +++ b/component/template/src/components.rs @@ -1,6 +1,9 @@ use color_eyre::Result; use crossterm::event::{KeyEvent, MouseEvent}; -use ratatui::{layout::Rect, Frame}; +use ratatui::{ + layout::{Rect, Size}, + Frame, +}; use tokio::sync::mpsc::UnboundedSender; use crate::{action::Action, config::Config, tui::Event}; @@ -48,7 +51,7 @@ pub trait Component { /// # Returns /// /// * `Result<()>` - An Ok result or an error. - fn init(&mut self, area: Rect) -> Result<()> { + fn init(&mut self, area: Size) -> Result<()> { let _ = area; // to appease clippy Ok(()) } diff --git a/simple-async-generated/Cargo.toml b/simple-async-generated/Cargo.toml index 001b9de..c245471 100644 --- a/simple-async-generated/Cargo.toml +++ b/simple-async-generated/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" edition = "2021" [dependencies] -crossterm = { version = "0.27.0", features = ["event-stream"] } +crossterm = { version = "0.28.1", features = ["event-stream"] } futures = "0.3.30" -ratatui = "0.27.0" -tokio = { version = "1.35.1", features = ["full"] } +ratatui = "0.28.0" +tokio = { version = "1.39.3", features = ["full"] } diff --git a/simple-async-generated/src/lib.rs b/simple-async-generated/src/lib.rs deleted file mode 100644 index 85ad8bf..0000000 --- a/simple-async-generated/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -/// Application. -pub mod app; - -/// Terminal events handler. -pub mod event; - -/// Widget renderer. -pub mod ui; - -/// Terminal user interface. -pub mod tui; - -/// Event handler. -pub mod handler; diff --git a/simple-async-generated/src/main.rs b/simple-async-generated/src/main.rs index e201ffd..e15f285 100644 --- a/simple-async-generated/src/main.rs +++ b/simple-async-generated/src/main.rs @@ -1,10 +1,19 @@ -use simple_async_generated::app::{App, AppResult}; -use simple_async_generated::event::{Event, EventHandler}; -use simple_async_generated::handler::handle_key_events; -use simple_async_generated::tui::Tui; use std::io; -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; + +use ratatui::{backend::CrosstermBackend, Terminal}; + +use crate::{ + app::{App, AppResult}, + event::{Event, EventHandler}, + handler::handle_key_events, + tui::Tui, +}; + +pub mod app; +pub mod event; +pub mod handler; +pub mod tui; +pub mod ui; #[tokio::main] async fn main() -> AppResult<()> { diff --git a/simple-async-generated/src/ui.rs b/simple-async-generated/src/ui.rs index c5135f4..defd047 100644 --- a/simple-async-generated/src/ui.rs +++ b/simple-async-generated/src/ui.rs @@ -29,6 +29,6 @@ pub fn render(app: &mut App, frame: &mut Frame) { ) .style(Style::default().fg(Color::Cyan).bg(Color::Black)) .centered(), - frame.size(), + frame.area(), ) } diff --git a/simple-async/Cargo.toml b/simple-async/Cargo.toml index 9319eeb..e7b5535 100644 --- a/simple-async/Cargo.toml +++ b/simple-async/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" edition = "2021" [dependencies] -crossterm = { version = "0.27.0", features = ["event-stream"] } +crossterm = { version = "0.28.1", features = ["event-stream"] } futures = "0.3.30" -ratatui = "0.27.0" -tokio = { version = "1.35.1", features = ["full"] } +ratatui = "0.28.0" +tokio = { version = "1.39.3", features = ["full"] } diff --git a/simple-async/src/lib.rs b/simple-async/src/lib.rs deleted file mode 100644 index 85ad8bf..0000000 --- a/simple-async/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -/// Application. -pub mod app; - -/// Terminal events handler. -pub mod event; - -/// Widget renderer. -pub mod ui; - -/// Terminal user interface. -pub mod tui; - -/// Event handler. -pub mod handler; diff --git a/simple-async/src/main.rs b/simple-async/src/main.rs index 21f237d..e15f285 100644 --- a/simple-async/src/main.rs +++ b/simple-async/src/main.rs @@ -1,10 +1,19 @@ -use {{crate_name}}::app::{App, AppResult}; -use {{crate_name}}::event::{Event, EventHandler}; -use {{crate_name}}::handler::handle_key_events; -use {{crate_name}}::tui::Tui; use std::io; -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; + +use ratatui::{backend::CrosstermBackend, Terminal}; + +use crate::{ + app::{App, AppResult}, + event::{Event, EventHandler}, + handler::handle_key_events, + tui::Tui, +}; + +pub mod app; +pub mod event; +pub mod handler; +pub mod tui; +pub mod ui; #[tokio::main] async fn main() -> AppResult<()> { diff --git a/simple-async/src/ui.rs b/simple-async/src/ui.rs index c5135f4..defd047 100644 --- a/simple-async/src/ui.rs +++ b/simple-async/src/ui.rs @@ -29,6 +29,6 @@ pub fn render(app: &mut App, frame: &mut Frame) { ) .style(Style::default().fg(Color::Cyan).bg(Color::Black)) .centered(), - frame.size(), + frame.area(), ) } diff --git a/simple-generated/Cargo.toml b/simple-generated/Cargo.toml index 99eeb43..fa7fa40 100644 --- a/simple-generated/Cargo.toml +++ b/simple-generated/Cargo.toml @@ -6,4 +6,4 @@ license = "MIT" edition = "2021" [dependencies] -ratatui = "0.27.0" +ratatui = "0.28.0" diff --git a/simple-generated/src/lib.rs b/simple-generated/src/lib.rs deleted file mode 100644 index 85ad8bf..0000000 --- a/simple-generated/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -/// Application. -pub mod app; - -/// Terminal events handler. -pub mod event; - -/// Widget renderer. -pub mod ui; - -/// Terminal user interface. -pub mod tui; - -/// Event handler. -pub mod handler; diff --git a/simple-generated/src/main.rs b/simple-generated/src/main.rs index d0b9432..a9cdd13 100644 --- a/simple-generated/src/main.rs +++ b/simple-generated/src/main.rs @@ -1,10 +1,19 @@ -use simple_generated::app::{App, AppResult}; -use simple_generated::event::{Event, EventHandler}; -use simple_generated::handler::handle_key_events; -use simple_generated::tui::Tui; use std::io; -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; + +use ratatui::{backend::CrosstermBackend, Terminal}; + +use crate::{ + app::{App, AppResult}, + event::{Event, EventHandler}, + handler::handle_key_events, + tui::Tui, +}; + +pub mod app; +pub mod event; +pub mod handler; +pub mod tui; +pub mod ui; fn main() -> AppResult<()> { // Create an application. diff --git a/simple-generated/src/ui.rs b/simple-generated/src/ui.rs index c5135f4..defd047 100644 --- a/simple-generated/src/ui.rs +++ b/simple-generated/src/ui.rs @@ -29,6 +29,6 @@ pub fn render(app: &mut App, frame: &mut Frame) { ) .style(Style::default().fg(Color::Cyan).bg(Color::Black)) .centered(), - frame.size(), + frame.area(), ) } diff --git a/simple/Cargo.toml b/simple/Cargo.toml index 32b7320..49409ba 100644 --- a/simple/Cargo.toml +++ b/simple/Cargo.toml @@ -6,4 +6,4 @@ license = "MIT" edition = "2021" [dependencies] -ratatui = "0.27.0" +ratatui = "0.28.0" diff --git a/simple/src/lib.rs b/simple/src/lib.rs deleted file mode 100644 index 85ad8bf..0000000 --- a/simple/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -/// Application. -pub mod app; - -/// Terminal events handler. -pub mod event; - -/// Widget renderer. -pub mod ui; - -/// Terminal user interface. -pub mod tui; - -/// Event handler. -pub mod handler; diff --git a/simple/src/main.rs b/simple/src/main.rs index c0590d9..a9cdd13 100644 --- a/simple/src/main.rs +++ b/simple/src/main.rs @@ -1,10 +1,19 @@ -use {{crate_name}}::app::{App, AppResult}; -use {{crate_name}}::event::{Event, EventHandler}; -use {{crate_name}}::handler::handle_key_events; -use {{crate_name}}::tui::Tui; use std::io; -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; + +use ratatui::{backend::CrosstermBackend, Terminal}; + +use crate::{ + app::{App, AppResult}, + event::{Event, EventHandler}, + handler::handle_key_events, + tui::Tui, +}; + +pub mod app; +pub mod event; +pub mod handler; +pub mod tui; +pub mod ui; fn main() -> AppResult<()> { // Create an application. diff --git a/simple/src/ui.rs b/simple/src/ui.rs index c5135f4..defd047 100644 --- a/simple/src/ui.rs +++ b/simple/src/ui.rs @@ -29,6 +29,6 @@ pub fn render(app: &mut App, frame: &mut Frame) { ) .style(Style::default().fg(Color::Cyan).bg(Color::Black)) .centered(), - frame.size(), + frame.area(), ) }