From adeab65eecffdc5c211d9d963618b72e2df7ae8d Mon Sep 17 00:00:00 2001 From: sxyazi Date: Sat, 6 Jun 2026 13:05:54 +0800 Subject: [PATCH] Pin Ratatui to 0.30.0 due to breaking changes in 0.30.1 --- .github/pull_request_template.md | 4 ++ Cargo.lock | 72 +++++++++++++++++++++++++------- Cargo.toml | 2 +- yazi-macro/src/lib.rs | 2 +- 4 files changed, 62 insertions(+), 18 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6ad65887..8c7716aa 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -15,3 +15,7 @@ A clear and concise description of the rationale of the changes, to help our rev If it has already been detailed in the associated issue, please skip this section. --> + +## Checklist + +- [ ] I have read [CONTRIBUTING.md](https://github.com/sxyazi/yazi/blob/main/CONTRIBUTING.md) diff --git a/Cargo.lock b/Cargo.lock index 50052f38..2ad2822a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,6 +165,15 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arbitrary" version = "1.4.2" @@ -2087,6 +2096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" dependencies = [ "hashbrown 0.16.1", + "portable-atomic", "thiserror 2.0.18", ] @@ -2786,6 +2796,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ + "approx", "bytemuck", "fast-srgb8", "libm", @@ -3082,6 +3093,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + [[package]] name = "powerfmt" version = "0.2.0" @@ -3320,9 +3337,9 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "ratatui" -version = "0.30.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1695748e3a735b34968c887ceea5a380b43545903868ae8f5b666593100f6b68" +checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" dependencies = [ "instability", "ratatui-core", @@ -3347,8 +3364,9 @@ dependencies = [ "itertools", "kasuari", "lru", + "palette", "serde", - "strum", + "strum 0.28.0", "thiserror 2.0.18", "unicode-segmentation", "unicode-truncate", @@ -3391,19 +3409,20 @@ dependencies = [ [[package]] name = "ratatui-widgets" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef4f17dd7ac3abf5adc2b920a03c61eee4bfe6a88fa5191936895525371d79c" +checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" dependencies = [ "bitflags 2.13.0", - "hashbrown 0.17.1", + "hashbrown 0.16.1", "indoc", "instability", "itertools", "line-clipping", "ratatui-core", "serde", - "strum", + "strum 0.27.2", + "time", "unicode-segmentation", "unicode-width", ] @@ -4202,13 +4221,34 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros 0.27.2", +] + [[package]] name = "strum" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ - "strum_macros", + "strum_macros 0.28.0", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] @@ -5634,7 +5674,7 @@ dependencies = [ "palette", "quantette", "ratatui", - "strum", + "strum 0.28.0", "tokio", "tracing", "yazi-config", @@ -5757,7 +5797,7 @@ dependencies = [ "regex", "serde", "serde_with", - "strum", + "strum 0.28.0", "tokio", "toml", "tracing", @@ -5783,7 +5823,7 @@ dependencies = [ "ratatui", "serde", "serde_with", - "strum", + "strum 0.28.0", "syntect", "tokio", "tokio-stream", @@ -5926,7 +5966,7 @@ dependencies = [ "regex", "scopeguard", "serde", - "strum", + "strum 0.28.0", "tokio", "tracing", "trash", @@ -5959,7 +5999,7 @@ dependencies = [ "ratatui", "serde", "serde_with", - "strum", + "strum 0.28.0", "tokio", "yazi-binding", "yazi-boot", @@ -6071,7 +6111,7 @@ dependencies = [ "ordered-float 5.3.0", "parking_lot", "serde", - "strum", + "strum 0.28.0", "tokio", "tracing", "yazi-binding", @@ -6116,7 +6156,7 @@ dependencies = [ "percent-encoding", "serde", "serde_with", - "strum", + "strum 0.28.0", "thiserror 2.0.18", "tokio", "typed-path", @@ -6159,7 +6199,7 @@ dependencies = [ "rustix 1.1.4", "serde", "signal-hook 0.4.4", - "strum", + "strum 0.28.0", "thiserror 2.0.18", "tokio", "windows-sys 0.61.2", diff --git a/Cargo.toml b/Cargo.toml index b7c2b52d..1056c8b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ parking_lot = "0.12.5" paste = "1.0.15" percent-encoding = "2.3.2" rand = { version = "0.10.1", default-features = false, features = [ "std", "sys_rng" ] } -ratatui = { version = "0.30.1", default-features = false, features = [ "layout-cache", "serde", "underline-color", "unstable-rendered-line-info", "unstable-widget-ref" ] } +ratatui = { version = "=0.30.0", default-features = false, features = [ "layout-cache", "serde", "underline-color", "unstable-rendered-line-info", "unstable-widget-ref" ] } regex = "1.12.3" russh = { version = "0.61.2", default-features = false, features = [ "ring", "rsa" ] } scopeguard = "1.2.0" diff --git a/yazi-macro/src/lib.rs b/yazi-macro/src/lib.rs index f3593b58..40110145 100644 --- a/yazi-macro/src/lib.rs +++ b/yazi-macro/src/lib.rs @@ -1,8 +1,8 @@ mod actor; -mod data; mod asset; mod confirm; mod context; +mod data; mod event; mod fmt; mod fs;