This commit is contained in:
sxyazi 2026-06-18 15:00:23 +08:00
parent d7cc0b48f7
commit ea86637e4b
No known key found for this signature in database
14 changed files with 134 additions and 325 deletions

376
Cargo.lock generated
View file

@ -19,9 +19,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "aead"
version = "0.6.0-rc.10"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b657e772794c6b04730ea897b66a058ccd866c16d1967da05eeeecec39043fe"
checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99"
dependencies = [
"crypto-common 0.2.2",
"inout",
@ -198,7 +198,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -435,9 +435,9 @@ dependencies = [
[[package]]
name = "block-buffer"
version = "0.12.0"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
dependencies = [
"hybrid-array",
"zeroize",
@ -464,9 +464,9 @@ dependencies = [
[[package]]
name = "bon"
version = "3.9.2"
version = "3.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2f04f6fef12d70d42a77b1433c9e0f065238479a6cefc4f5bab105e9873a3c3"
checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561"
dependencies = [
"bon-macros",
"rustversion",
@ -474,9 +474,9 @@ dependencies = [
[[package]]
name = "bon-macros"
version = "3.9.2"
version = "3.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d0bd4c2f75335ad98052a37efb54f428b492f64340257143b3429c8a508fa7b"
checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
dependencies = [
"darling",
"ident_case",
@ -484,7 +484,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -541,7 +541,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -582,9 +582,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.63"
version = "1.2.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
dependencies = [
"find-msvc-tools",
"jobserver",
@ -637,7 +637,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c"
dependencies = [
"block-buffer 0.12.0",
"block-buffer 0.12.1",
"crypto-common 0.2.2",
"inout",
"zeroize",
@ -703,7 +703,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -922,13 +922,13 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "crypto-bigint"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42a0d26b245348befa0c121944541476763dcc46ede886c88f9d12e1697d27c3"
checksum = "97bb4a855e3b10f84c4e7e895a7de01db7f9a7b7eb7f73ed9773fd52ac686451"
dependencies = [
"cpubits",
"ctutils",
"getrandom 0.4.2",
"getrandom 0.4.3",
"hybrid-array",
"num-traits",
"rand_core 0.10.1",
@ -953,19 +953,18 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
dependencies = [
"getrandom 0.4.2",
"getrandom 0.4.3",
"hybrid-array",
"rand_core 0.10.1",
]
[[package]]
name = "crypto-primes"
version = "0.7.0"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21f41f23de7d24cdbda7f0c4d9c0351f99a4ceb258ef30e5c1927af8987ffe5a"
checksum = "3633a51a39c69ebbaa4feaa694bd83d241e4093901c84a0963b19d9bb3f0cf8f"
dependencies = [
"crypto-bigint",
"libm",
"rand_core 0.10.1",
]
@ -1022,7 +1021,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1045,7 +1044,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1056,7 +1055,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
dependencies = [
"darling_core",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1093,7 +1092,7 @@ checksum = "780eb241654bf097afb00fc5f054a09b687dad862e485fdcf8399bb056565370"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1119,7 +1118,6 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
dependencies = [
"powerfmt",
"serde_core",
]
@ -1142,7 +1140,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1170,7 +1168,7 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
dependencies = [
"block-buffer 0.12.0",
"block-buffer 0.12.1",
"const-oid",
"crypto-common 0.2.2",
"ctutils",
@ -1297,7 +1295,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1317,7 +1315,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1495,12 +1493,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "foldhash"
version = "0.2.0"
@ -1578,7 +1570,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1656,17 +1648,15 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"r-efi 6.0.0",
"rand_core 0.10.1",
"wasip2",
"wasip3",
"wasm-bindgen",
]
@ -1736,15 +1726,6 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
dependencies = [
"foldhash 0.1.5",
]
[[package]]
name = "hashbrown"
version = "0.16.1"
@ -1753,7 +1734,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.2.0",
"foldhash",
]
[[package]]
@ -1764,7 +1745,7 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.2.0",
"foldhash",
"serde",
"serde_core",
]
@ -1847,12 +1828,6 @@ dependencies = [
"cc",
]
[[package]]
name = "id-arena"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
[[package]]
name = "ident_case"
version = "1.0.1"
@ -1970,7 +1945,7 @@ dependencies = [
"indoc",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -1993,7 +1968,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -2038,13 +2013,12 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.99"
version = "0.3.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
dependencies = [
"cfg-if",
"futures-util",
"once_cell",
"wasm-bindgen",
]
@ -2111,12 +2085,6 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "leb128fmt"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]]
name = "lebe"
version = "0.5.3"
@ -2378,7 +2346,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -2527,7 +2495,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -2771,7 +2739,7 @@ dependencies = [
"by_address",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -2879,7 +2847,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -2942,7 +2910,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -3080,14 +3048,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
name = "primefield"
version = "0.14.0-rc.10"
version = "0.14.0-rc.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f845ec3240cd5ed5e1e31cf3ff633a5bf47c698dc4092ba9e767415b3d393406"
checksum = "8675564771a62f69a0af716b03e89b917b963c7b173b5855575e84fd4f605ca0"
dependencies = [
"crypto-bigint",
"crypto-common 0.2.2",
@ -3125,7 +3093,7 @@ dependencies = [
"proc-macro-error-attr2",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -3153,7 +3121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
dependencies = [
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -3256,7 +3224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
dependencies = [
"chacha20",
"getrandom 0.4.2",
"getrandom 0.4.3",
"rand_core 0.10.1",
]
@ -3486,7 +3454,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -3593,7 +3561,7 @@ dependencies = [
"enum_dispatch",
"futures",
"generic-array 1.4.3",
"getrandom 0.4.2",
"getrandom 0.4.3",
"ghash",
"hex-literal",
"hmac",
@ -3848,7 +3816,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -3902,7 +3870,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4071,9 +4039,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
[[package]]
name = "smallvec"
version = "1.15.1"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
[[package]]
name = "socket2"
@ -4192,7 +4160,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4220,9 +4188,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.117"
version = "2.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
dependencies = [
"proc-macro2",
"quote",
@ -4262,7 +4230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
"getrandom 0.4.2",
"getrandom 0.4.3",
"once_cell",
"rustix 1.1.4",
"windows-sys 0.61.2",
@ -4369,7 +4337,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4380,7 +4348,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4428,12 +4396,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.47"
version = "0.3.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
dependencies = [
"deranged",
"itoa",
"libc",
"num-conv",
"num_threads",
@ -4445,15 +4412,15 @@ dependencies = [
[[package]]
name = "time-core"
version = "0.1.8"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
[[package]]
name = "time-macros"
version = "0.2.27"
version = "0.2.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
dependencies = [
"num-conv",
"time-core",
@ -4499,7 +4466,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4597,7 +4564,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -4730,12 +4697,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
[[package]]
name = "unicode-xid"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "universal-hash"
version = "0.6.1"
@ -4766,12 +4727,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.23.2"
version = "1.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
dependencies = [
"atomic",
"getrandom 0.4.2",
"getrandom 0.4.3",
"js-sys",
"serde_core",
"wasm-bindgen",
@ -4876,27 +4837,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
version = "1.0.3+wasi-0.2.9"
version = "1.0.4+wasi-0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
dependencies = [
"wit-bindgen 0.57.1",
]
[[package]]
name = "wasip3"
version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
"wit-bindgen 0.51.0",
"wit-bindgen",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.122"
version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
dependencies = [
"cfg-if",
"once_cell",
@ -4907,9 +4859,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.72"
version = "0.4.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -4917,9 +4869,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.122"
version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -4927,60 +4879,26 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.122"
version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
dependencies = [
"bumpalo",
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.122"
version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
dependencies = [
"unicode-ident",
]
[[package]]
name = "wasm-encoder"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
dependencies = [
"leb128fmt",
"wasmparser",
]
[[package]]
name = "wasm-metadata"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
dependencies = [
"anyhow",
"indexmap 2.14.0",
"wasm-encoder",
"wasmparser",
]
[[package]]
name = "wasmparser"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
"bitflags 2.13.0",
"hashbrown 0.15.5",
"indexmap 2.14.0",
"semver",
]
[[package]]
name = "weezl"
version = "0.1.12"
@ -5063,9 +4981,9 @@ dependencies = [
[[package]]
name = "which"
version = "8.0.3"
version = "8.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c789537cf2f7f55be8e6192f92e464174ee55f91af622777f7f1ceb0dbccd03e"
checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248"
dependencies = [
"libc",
]
@ -5186,7 +5104,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -5197,7 +5115,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -5208,7 +5126,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -5219,7 +5137,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -5445,100 +5363,12 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
[[package]]
name = "wit-bindgen"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
dependencies = [
"wit-bindgen-rust-macro",
]
[[package]]
name = "wit-bindgen"
version = "0.57.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
[[package]]
name = "wit-bindgen-core"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
dependencies = [
"anyhow",
"heck",
"wit-parser",
]
[[package]]
name = "wit-bindgen-rust"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
dependencies = [
"anyhow",
"heck",
"indexmap 2.14.0",
"prettyplease",
"syn 2.0.117",
"wasm-metadata",
"wit-bindgen-core",
"wit-component",
]
[[package]]
name = "wit-bindgen-rust-macro"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
dependencies = [
"anyhow",
"prettyplease",
"proc-macro2",
"quote",
"syn 2.0.117",
"wit-bindgen-core",
"wit-bindgen-rust",
]
[[package]]
name = "wit-component"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
"bitflags 2.13.0",
"indexmap 2.14.0",
"log",
"serde",
"serde_derive",
"serde_json",
"wasm-encoder",
"wasm-metadata",
"wasmparser",
"wit-parser",
]
[[package]]
name = "wit-parser"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
dependencies = [
"anyhow",
"id-arena",
"indexmap 2.14.0",
"log",
"semver",
"serde",
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser",
]
[[package]]
name = "wyz"
version = "0.5.1"
@ -5708,7 +5538,7 @@ version = "26.5.6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
@ -5885,7 +5715,7 @@ dependencies = [
"core-foundation-sys",
"dirs",
"either",
"foldhash 0.2.0",
"foldhash",
"hashbrown 0.17.1",
"inventory",
"libc",
@ -6038,7 +5868,7 @@ version = "26.5.6"
dependencies = [
"anyhow",
"async-priority-channel",
"foldhash 0.2.0",
"foldhash",
"hashbrown 0.17.1",
"libc",
"lru",
@ -6079,7 +5909,7 @@ version = "26.5.6"
dependencies = [
"anyhow",
"dyn-clone",
"foldhash 0.2.0",
"foldhash",
"futures",
"hashbrown 0.17.1",
"inventory",
@ -6260,29 +6090,29 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.50"
version = "0.8.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.50"
version = "0.8.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.117",
"syn 2.0.118",
]
[[package]]
name = "zeroize"
version = "1.8.2"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
[[package]]
name = "zmij"

View file

@ -19,4 +19,4 @@ proc-macro = true
# External dependencies
proc-macro2 = "1"
quote = "1.0.45"
syn = { version = "2.0.117", features = [ "full" ] }
syn = { version = "2.0.118", features = [ "full" ] }

View file

@ -22,8 +22,8 @@ impl<const L: u8> DerefMut for ChordArc<L> {
fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
}
impl<const L: u8> From<&ChordArc<L>> for ChordArc<L> {
fn from(value: &ChordArc<L>) -> Self { value.clone() }
impl<const L: u8> From<&Self> for ChordArc<L> {
fn from(value: &Self) -> Self { value.clone() }
}
impl<const L: u8, const M: u8> From<Chord<L>> for ChordArc<M> {
@ -70,7 +70,7 @@ impl TryFrom<(Value, Layer)> for ChordArc {
impl<const L: u8> ChordArc<L> {
pub fn as_erased<const M: u8>(&self) -> &ChordArc<M> {
unsafe { &*(self as *const ChordArc<L> as *const ChordArc<M>) }
unsafe { &*(self as *const Self as *const ChordArc<M>) }
}
pub fn into_erased<const M: u8>(self) -> ChordArc<M> {

View file

@ -52,7 +52,7 @@ impl TryFrom<Table> for OpenerRuleMatcher {
fn try_from(t: Table) -> Result<Self, Self::Error> {
let id: Id = t.raw_get("id").unwrap_or_default();
Ok(OpenerRuleMatcher { id, ..Default::default() }.into())
Ok(Self { id, ..Default::default() })
}
}

View file

@ -25,7 +25,7 @@ impl TryFrom<ActionCow> for WhichOpt {
Ok(Self {
tx: a.take_any2("tx").transpose()?,
cands: a.take_any_iter::<ChordArc>().map(Into::into).collect(),
cands: a.take_any_iter().collect(),
silent: a.bool("silent"),
times: a.get("times").unwrap_or(0),
})
@ -56,11 +56,7 @@ impl FromLua for WhichOpt {
Ok(Self {
tx: t.raw_get::<yazi_binding::MpscUnboundedTx<_>>("tx").ok().map(|t| t.0),
cands: t
.raw_get::<Table>("cands")?
.sequence_values::<ChordArc>()
.map(|c| c.map(Into::into))
.collect::<mlua::Result<Vec<_>>>()?,
cands: t.raw_get::<Table>("cands")?.sequence_values().collect::<mlua::Result<Vec<_>>>()?,
times: t.raw_get("times").unwrap_or_default(),
silent: t.raw_get("silent")?,
})

View file

@ -1,8 +1,7 @@
use mlua::{AnyUserData, ExternalError, FromLua, Lua, ObjectLike, Table, UserData, UserDataMethods, UserDataRef, UserDataRegistry, Value};
use yazi_binding::{impl_file_fields, impl_file_methods};
use yazi_shared::url::UrlBuf;
use crate::{cha::Cha, file::{File, FileInventory}};
use crate::file::{File, FileInventory};
pub type FileRef = UserDataRef<File>;
@ -18,11 +17,7 @@ impl TryFrom<Table> for File {
type Error = mlua::Error;
fn try_from(value: Table) -> Result<Self, Self::Error> {
Ok(Self {
url: value.raw_get::<UrlBuf>("url")?.into(),
cha: value.raw_get::<Cha>("cha")?,
..Default::default()
})
Ok(Self { url: value.raw_get("url")?, cha: value.raw_get("cha")?, ..Default::default() })
}
}

View file

@ -1,8 +1,7 @@
use mlua::{Lua, Table, UserData};
use yazi_codegen::FromLuaOwned;
use yazi_fs::{cha::Cha, file::File};
use yazi_macro::impl_data_any;
use yazi_shared::{id::Id, path::PathBufDyn, url::UrlBuf};
use yazi_shared::url::UrlBuf;
#[derive(Clone, FromLuaOwned)]
pub(super) struct FilesOp(yazi_fs::FilesOp);
@ -19,39 +18,30 @@ impl AsRef<yazi_fs::FilesOp> for FilesOp {
impl FilesOp {
pub(super) fn part(_: &Lua, t: Table) -> mlua::Result<Self> {
let id: Id = t.raw_get("id")?;
let url: UrlBuf = t.raw_get("url")?;
let id = t.raw_get("id")?;
let url = t.raw_get("url")?;
let files: Table = t.raw_get("files")?;
Ok(Self(yazi_fs::FilesOp::Part(
url.into(),
files
.sequence_values::<File>()
.map(|f| f.map(Into::into))
.collect::<mlua::Result<Vec<_>>>()?,
url,
files.sequence_values().collect::<mlua::Result<Vec<_>>>()?,
id,
)))
}
pub(super) fn done(_: &Lua, t: Table) -> mlua::Result<Self> {
let id: Id = t.raw_get("id")?;
let cha: Cha = t.raw_get("cha")?;
let url: UrlBuf = t.raw_get("url")?;
let id = t.raw_get("id")?;
let cha = t.raw_get("cha")?;
let url = t.raw_get("url")?;
Ok(Self(yazi_fs::FilesOp::Done(url.into(), cha, id)))
Ok(Self(yazi_fs::FilesOp::Done(url, cha, id)))
}
pub(super) fn size(_: &Lua, t: Table) -> mlua::Result<Self> {
let url: UrlBuf = t.raw_get("url")?;
let sizes: Table = t.raw_get("sizes")?;
Ok(Self(yazi_fs::FilesOp::Size(
url.into(),
sizes
.pairs::<PathBufDyn, u64>()
.map(|r| r.map(|(urn, size)| (urn.into(), size)))
.collect::<mlua::Result<_>>()?,
)))
Ok(Self(yazi_fs::FilesOp::Size(url, sizes.pairs().collect::<mlua::Result<_>>()?)))
}
}

View file

@ -11,7 +11,7 @@ impl Utils {
lua.create_async_function(|lua, url: UrlRef| async move {
let path = url.as_url().unified_path().into_owned();
match ImageInfo::new(path).await {
Ok(info) => ImageInfo::from(info).into_lua_multi(&lua),
Ok(info) => info.into_lua_multi(&lua),
Err(e) => (Value::Nil, Error::custom(e.to_string())).into_lua_multi(&lua),
}
})

View file

@ -14,6 +14,6 @@ impl WhichProxy {
silent,
times: 0,
})));
Some(rx.recv().await??.into())
rx.recv().await?
}
}

View file

@ -48,7 +48,7 @@ impl Debug for dyn DataAny {
impl<T: Clone + Send + Sync + 'static> DataAny for Vec<T> {
fn as_any(&self, id: TypeId) -> Option<&dyn Any> {
(id == TypeId::of::<Self>()).then(|| self as &dyn Any)
(id == TypeId::of::<Self>()).then_some(self as &dyn Any)
}
fn into_any(self: Box<Self>, id: TypeId) -> Result<Box<dyn Any>, Box<dyn DataAny>> {
@ -60,7 +60,7 @@ impl<T: Clone + Send + Sync + 'static> DataAny for Vec<T> {
impl<T: Send + 'static> DataAny for tokio::sync::mpsc::UnboundedSender<T> {
fn as_any(&self, id: TypeId) -> Option<&dyn Any> {
(id == TypeId::of::<Self>()).then(|| self as &dyn Any)
(id == TypeId::of::<Self>()).then_some(self as &dyn Any)
}
fn into_any(self: Box<Self>, id: TypeId) -> Result<Box<dyn Any>, Box<dyn DataAny>> {

View file

@ -42,10 +42,10 @@ impl Sendable {
}
Value::UserData(ud) => match ud.type_id() {
Some(t) if t == TypeId::of::<UrlBuf>() => {
return Ok(Data::Url(ud.take::<UrlBuf>()?.into()));
return Ok(Data::Url(ud.take()?));
}
Some(t) if t == TypeId::of::<PathBufDyn>() => {
return Ok(Data::Path(ud.take::<PathBufDyn>()?.into()));
return Ok(Data::Path(ud.take()?));
}
Some(t) if t == TypeId::of::<Id>() => {
return Ok(Data::Id(*ud.borrow::<Id>()?));
@ -202,10 +202,8 @@ impl Sendable {
Value::Function(_) => Err("function is not supported".into_lua_err())?,
Value::Thread(_) => Err("thread is not supported".into_lua_err())?,
Value::UserData(ud) => match ud.type_id() {
Some(t) if t == TypeId::of::<UrlBuf>() => DataKey::Url(ud.take::<UrlBuf>()?.into()),
Some(t) if t == TypeId::of::<PathBufDyn>() => {
DataKey::Path(ud.take::<PathBufDyn>()?.into())
}
Some(t) if t == TypeId::of::<UrlBuf>() => DataKey::Url(ud.take()?),
Some(t) if t == TypeId::of::<PathBufDyn>() => DataKey::Path(ud.take()?),
Some(t) if t == TypeId::of::<Id>() => DataKey::Id(*ud.borrow::<Id>()?),
_ => Err(format!("unsupported userdata included: {ud:?}").into_lua_err())?,
},

View file

@ -40,7 +40,7 @@ pub fn escape_os_bytes(b: &[u8]) -> Cow<'_, [u8]> {
#[cfg(windows)]
pub fn escape_os_str(s: &std::ffi::OsStr) -> Cow<'_, std::ffi::OsStr> {
use crate::wtf8::FromWtf8Vec;
use yazi_shim::wtf8::FromWtf8Vec;
match escape_os_bytes(s.as_encoded_bytes()) {
Cow::Borrowed(_) => Cow::Borrowed(s),

View file

@ -14,10 +14,10 @@ impl FromStr for KeyEvent {
if !s.starts_with('<') || !s.ends_with('>') {
let c = s.chars().next().unwrap();
return Ok(KeyEvent::new(KeyCode::Char(c), Modifiers::for_char(c)));
return Ok(Self::new(KeyCode::Char(c), Modifiers::for_char(c)));
}
let mut key: KeyEvent = KeyCode::Null.into();
let mut key: Self = KeyCode::Null.into();
let mut it = s[1..s.len() - 1].split_inclusive('-').peekable();
while let Some(next) = it.next() {
match next.to_ascii_lowercase().as_str() {

View file

@ -41,7 +41,7 @@ impl TryFrom<&Table> for InputOpt {
type Error = mlua::Error;
fn try_from(t: &Table) -> Result<Self, Self::Error> {
Ok(InputOpt {
Ok(Self {
title: t.raw_get("title").unwrap_or_default(),
value: t.raw_get("value").unwrap_or_default(),
styles: t.raw_get("styles")?,