diff --git a/Cargo.lock b/Cargo.lock index 3efdece..dfa7a88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,12 +61,14 @@ dependencies = [ [[package]] name = "ansi-to-tui" -version = "3.1.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e348dcd256ba06d44d5deabc88a7c0e80ee7303158253ca069bcd9e9b7f57" +checksum = "8438af3d7e7dccdb98eff55e5351587d9bec2294daff505fc9a061bd14d22db0" dependencies = [ "nom", - "ratatui 0.26.1", + "ratatui", + "simdutf8", + "smallvec", "thiserror", ] @@ -393,6 +395,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "euphony" version = "2.1.1" @@ -413,12 +425,12 @@ dependencies = [ "parking_lot", "pathdiff", "rand", - "ratatui 0.25.0", + "ratatui", "serde", "serde_json", "state", "strip-ansi-escapes", - "textwrap 0.16.1", + "textwrap", "thiserror", "tokio", "toml", @@ -461,8 +473,8 @@ dependencies = [ [[package]] name = "fs-more" -version = "0.2.2" -source = "git+https://github.com/simongoricar/fs-more.git?rev=c3c2e421ca5e6dc09ea7a1af8e34c809dd0e6910#c3c2e421ca5e6dc09ea7a1af8e34c809dd0e6910" +version = "0.4.0" +source = "git+https://github.com/simongoricar/fs-more.git?rev=088c1cb0421836741bffe266c69a9767d676064b#088c1cb0421836741bffe266c69a9767d676064b" dependencies = [ "dunce", "fs-err", @@ -523,12 +535,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "iana-time-zone" version = "0.1.60" @@ -568,17 +574,6 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "is_ci" version = "1.2.0" @@ -627,6 +622,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + [[package]] name = "lock_api" version = "0.4.11" @@ -685,30 +686,29 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miette" -version = "5.10.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ "backtrace", "backtrace-ext", - "is-terminal", + "cfg-if", "miette-derive", - "once_cell", "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", - "textwrap 0.15.2", + "textwrap", "thiserror", "unicode-width", ] [[package]] name = "miette-derive" -version = "5.10.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", @@ -815,9 +815,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "parking_lot" @@ -926,25 +926,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "ratatui" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" -dependencies = [ - "bitflags 2.4.2", - "cassowary", - "crossterm", - "indoc", - "itertools", - "lru", - "paste", - "stability", - "strum 0.25.0", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "ratatui" version = "0.26.1" @@ -954,12 +935,13 @@ dependencies = [ "bitflags 2.4.2", "cassowary", "compact_str", + "crossterm", "indoc", "itertools", "lru", "paste", "stability", - "strum 0.26.2", + "strum", "unicode-segmentation", "unicode-width", ] @@ -1023,6 +1005,19 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1126,6 +1121,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "smallvec" version = "1.13.1" @@ -1178,35 +1179,13 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] - [[package]] name = "strum" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.2", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.53", + "strum_macros", ] [[package]] @@ -1224,31 +1203,24 @@ dependencies = [ [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" dependencies = [ - "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] +checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" [[package]] name = "supports-unicode" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" -dependencies = [ - "is-terminal", -] +checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" @@ -1274,23 +1246,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.15.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", + "rustix", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b43219a..5d22d1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,35 +19,35 @@ euphony_library = { path = "./euphony_library" } euphony_configuration = { path = "./euphony_configuration" } # Error handling -miette = { version = "5.10.0", features = ["fancy"] } -thiserror = "1.0.51" +miette = { version = "7.2.0", features = ["fancy"] } +thiserror = "1.0.58" # Serialization and deserialization -serde = { version = "1.0.136", features = ["derive"] } -serde_json = "1.0.81" -toml = "0.8.8" +serde = { version = "1.0.197", features = ["derive"] } +serde_json = "1.0.114" +toml = "0.8.11" # Other dependencies -clap = { version = "4.0.9", features = ["derive"] } +clap = { version = "4.5.3", features = ["derive"] } pathdiff = "0.2.1" dunce = "1.0.4" state = "0.6.0" -ratatui = "0.25.0" +ratatui = "0.26.1" crossterm = "0.27.0" -tokio = { version = "1.28.2", features = ["sync"] } +tokio = { version = "1.36.0", features = ["sync"] } rand = "0.8.5" -ansi-to-tui = "3.1.0" -ctrlc = "3.2.4" -crossbeam = "0.8.2" +ansi-to-tui = "4.0.1" +ctrlc = "3.4.4" +crossbeam = "0.8.4" strip-ansi-escapes = "0.2.0" -oneshot = { version = "0.1.5", default-features = false, features = ["std"] } +oneshot = { version = "0.1.6", default-features = false, features = ["std"] } closure = "0.3.0" linked-hash-map = "0.5.6" parking_lot = "0.12.1" -textwrap = "0.16.0" -chrono = "0.4.26" +textwrap = "0.16.1" +chrono = "0.4.35" -fs-more = { git = "https://github.com/simongoricar/fs-more.git", rev = "c3c2e421ca5e6dc09ea7a1af8e34c809dd0e6910", features = ["fs-err", "miette"] } +fs-more = { git = "https://github.com/simongoricar/fs-more.git", rev = "088c1cb0421836741bffe266c69a9767d676064b", features = ["fs-err", "miette"] } [dependencies]