diff --git a/.luarc.json b/.luarc.json index 53b151a1..c82412a5 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json", - "runtime.version": "Lua 5.4", + "runtime.version": "Lua 5.5", "runtime.special": { "fail": "error" }, diff --git a/CHANGELOG.md b/CHANGELOG.md index dedac640..42857e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/): - New `cx.which` API to access the which component state ([#3617]) - New `ind-which-activate` DDS event to change the which component behavior ([#3608]) +### Changed + +- Upgrade Lua to 5.5 ([#3633]) + ### Fixed - Archive extraction fails for target paths with non-ASCII characters on Windows ([#3607]) @@ -1624,3 +1628,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/): [#3607]: https://github.com/sxyazi/yazi/pull/3607 [#3608]: https://github.com/sxyazi/yazi/pull/3608 [#3617]: https://github.com/sxyazi/yazi/pull/3617 +[#3633]: https://github.com/sxyazi/yazi/pull/3633 diff --git a/Cargo.lock b/Cargo.lock index 30d2c661..54b25bf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,7 +143,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -154,7 +154,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -600,9 +600,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.54" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +checksum = "3e34525d5bbbd55da2bb745d34b36121baac88d07619a9a09cfcf4a6c0832785" dependencies = [ "clap_builder", "clap_derive", @@ -610,9 +610,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.54" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +checksum = "59a20016a20a3da95bef50ec7238dbd09baeef4311dcdd38ec15aba69812fb61" dependencies = [ "anstream", "anstyle", @@ -651,9 +651,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.49" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" +checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" dependencies = [ "heck", "proc-macro2", @@ -1267,7 +1267,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1419,7 +1419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2351,9 +2351,9 @@ dependencies = [ [[package]] name = "lua-src" -version = "548.1.2" +version = "550.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc4e1aff422ad5f08cffb4719603dcdbc2be2307f4c1510d7aab74b7fa88ca8" +checksum = "e836dc8ae16806c9bdcf42003a88da27d163433e3f9684c52f0301258004a4fb" dependencies = [ "cc", ] @@ -2453,9 +2453,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935ac67539907efcd7198137eb7358e052555f77fe1b2916600a2249351f2b33" +checksum = "ccd36acfa49ce6ee56d1307a061dd302c564eee757e6e4cd67eb4f7204846fab" dependencies = [ "anyhow", "bstr", @@ -2475,12 +2475,13 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c968af21bf6b19fc9ca8e7b85ee16f86e4c9e3d0591de101a5608086bda0ad8" +checksum = "0f1c3a7fc7580227ece249fd90aa2fa3b39eb2b49d3aec5e103b3e85f2c3dfc8" dependencies = [ "cc", "cfg-if", + "libc", "lua-src", "luajit-src", "pkg-config", @@ -2598,7 +2599,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3831,7 +3832,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4771,9 +4772,9 @@ dependencies = [ [[package]] name = "typed-path" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43ffa54726cdc9ea78392023ffe9fe9cf9ac779e1c6fcb0d23f9862e3879d20" +checksum = "3015e6ce46d5ad8751e4a772543a30c7511468070e98e64e20165f8f81155b64" [[package]] name = "typeid" @@ -5161,7 +5162,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5662,7 +5663,6 @@ dependencies = [ "yazi-macro", "yazi-shared", "yazi-shim", - "yazi-term", ] [[package]] @@ -5707,7 +5707,6 @@ dependencies = [ "indexmap 2.13.0", "parking_lot", "ratatui", - "serde", "tokio", "tokio-stream", "tokio-util", @@ -5814,7 +5813,6 @@ dependencies = [ "yazi-plugin", "yazi-proxy", "yazi-shared", - "yazi-shim", "yazi-term", "yazi-tty", "yazi-vfs", diff --git a/Cargo.toml b/Cargo.toml index fd98d7e8..f9ff91d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ ansi-to-tui = "8.0.1" anyhow = "1.0.100" base64 = "0.22.1" bitflags = { version = "2.10.0", features = [ "serde" ] } -clap = { version = "4.5.54", features = [ "derive" ] } +clap = { version = "4.5.55", features = [ "derive" ] } core-foundation-sys = "0.8.7" crossterm = { version = "0.29.0", features = [ "event-stream" ] } dirs = "6.0.0" @@ -42,7 +42,7 @@ hashbrown = { version = "0.16.1", features = [ "serde" ] } indexmap = { version = "2.13.0", features = [ "serde" ] } libc = "0.2.180" lru = "0.16.3" -mlua = { version = "0.11.5", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serde" ] } +mlua = { version = "0.11.6", features = [ "anyhow", "async", "error-send", "lua55", "macros", "serde" ] } objc2 = "0.6.3" ordered-float = { version = "5.1.0", features = [ "serde" ] } parking_lot = "0.12.5" @@ -64,7 +64,7 @@ tokio-util = "0.7.18" toml = { version = "0.9.11" } tracing = { version = "0.1.44", features = [ "max_level_debug", "release_max_level_debug" ] } twox-hash = { version = "2.1.2", default-features = false, features = [ "std", "random", "xxhash3_128" ] } -typed-path = "0.12.1" +typed-path = "0.12.2" unicode-width = { version = "0.2.2", default-features = false } uzers = "0.12.2" diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml index 38f01445..c51010ef 100644 --- a/yazi-cli/Cargo.toml +++ b/yazi-cli/Cargo.toml @@ -28,7 +28,6 @@ yazi-fs = { path = "../yazi-fs", version = "26.1.22" } yazi-macro = { path = "../yazi-macro", version = "26.1.22" } yazi-shared = { path = "../yazi-shared", version = "26.1.22" } yazi-shim = { path = "../yazi-shim", version = "26.1.22" } -yazi-term = { path = "../yazi-term", version = "26.1.22" } # External dependencies anyhow = { workspace = true } diff --git a/yazi-core/Cargo.toml b/yazi-core/Cargo.toml index ef6ce320..cc64d624 100644 --- a/yazi-core/Cargo.toml +++ b/yazi-core/Cargo.toml @@ -34,7 +34,6 @@ hashbrown = { workspace = true } indexmap = { workspace = true } parking_lot = { workspace = true } ratatui = { workspace = true } -serde = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } tokio-util = { workspace = true } diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml index 623f9a22..9b28f810 100644 --- a/yazi-fm/Cargo.toml +++ b/yazi-fm/Cargo.toml @@ -40,7 +40,6 @@ yazi-parser = { path = "../yazi-parser", version = "26.1.22" } yazi-plugin = { path = "../yazi-plugin", version = "26.1.22" } yazi-proxy = { path = "../yazi-proxy", version = "26.1.22" } yazi-shared = { path = "../yazi-shared", version = "26.1.22" } -yazi-shim = { path = "../yazi-shim", version = "26.1.22" } yazi-term = { path = "../yazi-term", version = "26.1.22" } yazi-tty = { path = "../yazi-tty", version = "26.1.22" } yazi-vfs = { path = "../yazi-vfs", version = "26.1.22" }