From 80a54c3dd555ed3957c3dec53c79174351e85731 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Sat, 11 Apr 2026 09:25:17 +0800 Subject: [PATCH] fix: use `u64` for parsing Linux partition blocks (#3873) --- Cargo.lock | 50 ++++++++++++++++++------------------- yazi-boot/Cargo.toml | 2 +- yazi-cli/Cargo.toml | 2 +- yazi-fs/src/mounts/linux.rs | 2 +- yazi-parser/src/mgr/cd.rs | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b169516..7c8669dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,13 +50,13 @@ dependencies = [ [[package]] name = "aes" -version = "0.9.0-rc.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04097e08a47d9ad181c2e1f4a5fabc9ae06ce8839a333ba9a949bcb0d31fd2a3" +checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8" dependencies = [ "cipher 0.5.1", "cpubits", - "cpufeatures 0.2.17", + "cpufeatures 0.3.0", ] [[package]] @@ -80,9 +80,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e22c0c90bbe8d4f77c3ca9ddabe41a1f8382d6fc1f7cea89459d0f320371f972" dependencies = [ "aead 0.6.0-rc.10", - "aes 0.9.0-rc.4", + "aes 0.9.0", "cipher 0.5.1", - "ctr 0.10.0-rc.4", + "ctr 0.10.0", "ghash 0.6.0", "subtle", ] @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "cbc" -version = "0.2.0-rc.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab1412b9ae2463ede01f1e591412dfbcfeacecf40e8c4c3e0655814c19065c38" +checksum = "98db6aeaef0eeef2c1e3ce9a27b739218825dae116076352ac3777076aa22225" dependencies = [ "cipher 0.5.1", ] @@ -691,9 +691,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c9f1dde76b736e3681f28cec9d5a61299cbaae0fce80a68e43724ad56031eb" +checksum = "406e68b4de5c59cfb8f750a7cbd4d31ae153788b8352167c1e5f4fc26e8c91e9" dependencies = [ "clap", ] @@ -1026,9 +1026,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.10.0-rc.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee683dd898fbd052617b4514bc31f98bc32081a83b69ec46adef3b1ef4ae36f" +checksum = "17469f8eb9bdbfad10f71f4cfddfd38b01143520c0e717d8796ccb4d44d44e42" dependencies = [ "cipher 0.5.1", ] @@ -2178,9 +2178,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" dependencies = [ "cfg-if", "futures-util", @@ -3151,9 +3151,9 @@ version = "0.8.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5a777c6e26664bc9504b3ce3f6133f8f20d9071f130a4f9fcbd3186959d8dd6" dependencies = [ - "aes 0.9.0-rc.4", + "aes 0.9.0", "aes-gcm 0.11.0-rc.3", - "cbc 0.2.0-rc.4", + "cbc 0.2.0", "der", "pbkdf2 0.13.0-rc.10", "rand_core 0.10.0", @@ -5094,9 +5094,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ "cfg-if", "once_cell", @@ -5107,9 +5107,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.67" +version = "0.4.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" +checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" dependencies = [ "js-sys", "wasm-bindgen", @@ -5117,9 +5117,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5127,9 +5127,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ "bumpalo", "proc-macro2", @@ -5140,9 +5140,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] diff --git a/yazi-boot/Cargo.toml b/yazi-boot/Cargo.toml index 7933fc47..b26e7446 100644 --- a/yazi-boot/Cargo.toml +++ b/yazi-boot/Cargo.toml @@ -32,7 +32,7 @@ yazi-shared = { path = "../yazi-shared", version = "26.2.2" } # External dependencies clap = { workspace = true } -clap_complete = "4.6.0" +clap_complete = "4.6.1" clap_complete_fig = "4.5.2" clap_complete_nushell = "4.6.0" vergen-gitcl = { version = "9.1.0", features = [ "build", "rustc" ] } diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml index 900ac43b..1b479571 100644 --- a/yazi-cli/Cargo.toml +++ b/yazi-cli/Cargo.toml @@ -47,7 +47,7 @@ yazi-shared = { path = "../yazi-shared", version = "26.2.2" } # External build dependencies anyhow = { workspace = true } clap = { workspace = true } -clap_complete = "4.6.0" +clap_complete = "4.6.1" clap_complete_fig = "4.5.2" clap_complete_nushell = "4.6.0" serde = { workspace = true } diff --git a/yazi-fs/src/mounts/linux.rs b/yazi-fs/src/mounts/linux.rs index 66df3ae5..914af16e 100644 --- a/yazi-fs/src/mounts/linux.rs +++ b/yazi-fs/src/mounts/linux.rs @@ -66,7 +66,7 @@ impl Partitions { let mut it = line.split_whitespace(); let Some(Ok(_major)) = it.next().map(|s| s.parse::()) else { continue }; let Some(Ok(_minor)) = it.next().map(|s| s.parse::()) else { continue }; - let Some(Ok(_blocks)) = it.next().map(|s| s.parse::()) else { continue }; + let Some(Ok(_blocks)) = it.next().map(|s| s.parse::()) else { continue }; if let Some(name) = it.next() { set.insert(Self::unmangle_octal(name).into_owned()); } diff --git a/yazi-parser/src/mgr/cd.rs b/yazi-parser/src/mgr/cd.rs index 5cd3160d..9b310531 100644 --- a/yazi-parser/src/mgr/cd.rs +++ b/yazi-parser/src/mgr/cd.rs @@ -7,7 +7,7 @@ use yazi_vfs::provider; #[derive(Debug, Deserialize)] pub struct CdForm { - #[serde(alias = "0")] + #[serde(alias = "0", default)] pub target: UrlBuf, #[serde(default)] pub interactive: bool,