From c6dc82fbd9f49bafc5a015923c19eaf08f3ff0f2 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 12:02:52 +0200 Subject: [PATCH 1/6] feat!: Better api to create archive. Instead of providing a strip_prefix, now arx trim all parents from given path by default. We add an option `--keep-parents` to use the full path. And `--dir-as-root` to trim the directory itself (and so put files in the directory directly in the root of the archive). In the process, we now accept absolute path. --- Cargo.lock | 1120 ++++++++++++++++++++------------- arx/Cargo.toml | 2 + arx/src/create.rs | 64 +- arx/tests/create.rs | 191 +++++- arx/tests/extract_mount.rs | 7 +- arx/tests/utils/mod.rs | 9 +- arx/tests/utils/tree_diff.rs | 23 + libarx/src/create/fs_adder.rs | 149 +++-- python/src/creator.rs | 6 +- 9 files changed, 1017 insertions(+), 554 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a4e686..52c7768 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 4 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" @@ -34,12 +34,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -51,9 +45,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -66,50 +60,50 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" dependencies = [ "anstyle", - "once_cell", - "windows-sys 0.59.0", + "once_cell_polyfill", + "windows-sys 0.60.2", ] [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] @@ -150,21 +144,23 @@ dependencies = [ "lipsum", "log", "rand", + "relative-path 2.0.1", "rustest", "tempfile", + "walkdir", ] [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -172,7 +168,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-link", ] [[package]] @@ -193,15 +189,15 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "blake3" -version = "1.5.5" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -221,9 +217,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "regex-automata", @@ -232,9 +228,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -273,16 +269,17 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" [[package]] name = "cc" -version = "1.2.11" +version = "1.2.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4730490333d58093109dc02c23174c3f4d490998c3fed3cc8e82d57afedb9cf" +checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -290,9 +287,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -302,16 +299,15 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-link", ] [[package]] @@ -326,9 +322,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f" dependencies = [ "clap_builder", "clap_derive", @@ -336,9 +332,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730" dependencies = [ "anstream", "anstyle", @@ -348,36 +344,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.44" +version = "4.5.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6" +checksum = "2348487adcd4631696ced64ccdb40d38ac4d31cae7f2eec8817fcea1b9d1c43c" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "clap_mangen" -version = "0.2.26" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a" +checksum = "263c8214a8e0cb8129f3c62036c50e9c6e15c7bd364c42e0437c492b9293f778" dependencies = [ "clap", "roff", @@ -401,20 +397,20 @@ dependencies = [ "nom", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "console" -version = "0.15.10" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" dependencies = [ "encode_unicode", "libc", @@ -425,9 +421,9 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -466,9 +462,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" dependencies = [ "crc-catalog", ] @@ -481,9 +477,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -534,9 +530,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5" +checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6" dependencies = [ "ctor-proc-macro", "dtor", @@ -544,9 +540,9 @@ dependencies = [ [[package]] name = "ctor-proc-macro" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d" +checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" [[package]] name = "daemonize" @@ -559,28 +555,34 @@ dependencies = [ [[package]] name = "deflate64" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" [[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" + +[[package]] +name = "deranged" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" dependencies = [ "powerfmt", ] [[package]] name = "derive_arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] @@ -602,7 +604,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] @@ -631,9 +633,9 @@ checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encode_unicode" @@ -643,23 +645,23 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "env_filter" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ "log", ] [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -674,18 +676,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -702,21 +704,27 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" dependencies = [ "crc32fast", "miniz_oxide", @@ -724,15 +732,15 @@ dependencies = [ [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -770,7 +778,7 @@ dependencies = [ "page_size", "pkg-config", "smallvec", - "zerocopy 0.8.14", + "zerocopy 0.8.27", ] [[package]] @@ -784,9 +792,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", @@ -794,34 +802,34 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.13.3+wasi-0.2.2", + "r-efi", + "wasip2", "wasm-bindgen", - "windows-targets", ] [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "git-version" @@ -840,26 +848,32 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "heck" version = "0.5.0" @@ -877,9 +891,9 @@ dependencies = [ [[package]] name = "human-panic" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" +checksum = "ac63a746b187e95d51fe16850eb04d1cfef203f6af98e6c405a6f262ad3df00a" dependencies = [ "anstream", "anstyle", @@ -891,22 +905,17 @@ dependencies = [ "uuid", ] -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -922,21 +931,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -945,31 +955,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -977,72 +967,59 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -1051,9 +1028,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -1061,12 +1038,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.16.0", ] [[package]] @@ -1084,15 +1061,15 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "generic-array", ] @@ -1103,20 +1080,51 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -1131,7 +1139,7 @@ dependencies = [ "clap", "const_format", "crc", - "deranged", + "deranged 0.3.11", "dropout", "fxhash", "log", @@ -1143,11 +1151,11 @@ dependencies = [ "smallvec", "spmc", "tempfile", - "thiserror 2.0.11", + "thiserror 2.0.17", "uuid", "xz2", "zerocopy 0.7.35", - "zstd 0.13.2", + "zstd 0.13.3", ] [[package]] @@ -1164,7 +1172,7 @@ dependencies = [ "log", "lru", "rayon", - "relative-path", + "relative-path 1.9.3", "rustest", "tempfile", "thiserror 1.0.69", @@ -1173,15 +1181,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ "bitflags", "libc", @@ -1202,9 +1210,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "lipsum" @@ -1218,21 +1226,15 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" - -[[package]] -name = "lockfree-object-pool" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "log" -version = "0.4.25" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru" @@ -1240,7 +1242,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown", + "hashbrown 0.15.5", ] [[package]] @@ -1285,15 +1287,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memmap2" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +checksum = "843a98750cd611cc2965a8213b53b43e715f13c37a9e096c6408e69990961db7" dependencies = [ "libc", ] @@ -1315,11 +1317,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -1382,26 +1385,33 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "os_info" -version = "3.9.2" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6520c8cc998c5741ee68ec1dc369fc47e5f0ea5320018ecf2a1ccd6328f48b" +checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3" dependencies = [ "log", + "plist", "serde", "windows-sys 0.52.0", ] @@ -1437,21 +1447,52 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "plist" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" +dependencies = [ + "base64", + "indexmap", + "quick-xml", + "serde", + "time", +] [[package]] name = "portable-atomic" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "potential_utf" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +dependencies = [ + "zerovec", +] [[package]] name = "powerfmt" @@ -1461,27 +1502,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.7.35", + "zerocopy 0.8.27", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" dependencies = [ "cfg-if", "indoc", @@ -1497,9 +1538,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" dependencies = [ "once_cell", "target-lexicon", @@ -1507,9 +1548,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" dependencies = [ "libc", "pyo3-build-config", @@ -1517,27 +1558,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "pyo3-macros-backend" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" dependencies = [ "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] @@ -1549,15 +1590,30 @@ dependencies = [ "pyo3", ] +[[package]] +name = "quick-xml" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89" +dependencies = [ + "memchr", +] + [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.8.5" @@ -1585,14 +1641,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1600,9 +1656,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1610,18 +1666,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" [[package]] name = "relative-path" @@ -1629,6 +1685,15 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" +[[package]] +name = "relative-path" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca40a312222d8ba74837cb474edef44b37f561da5f773981007a10bbaa992b0" +dependencies = [ + "serde", +] + [[package]] name = "ring" version = "0.17.14" @@ -1637,7 +1702,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -1651,9 +1716,9 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustest" @@ -1674,27 +1739,27 @@ checksum = "a82be781069eaf509640d1cb7d8ddf2195b0bd41737ffacd42e6489d16adcdfe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "rustix" -version = "0.38.44" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.22" +version = "0.23.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" +checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c" dependencies = [ "log", "once_cell", @@ -1707,15 +1772,18 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ "ring", "rustls-pki-types", @@ -1724,9 +1792,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "same-file" @@ -1739,31 +1807,41 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "serde_spanned" -version = "0.6.8" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -1791,9 +1869,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "spmc" @@ -1803,9 +1881,9 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" @@ -1832,9 +1910,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -1843,20 +1921,20 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "tar" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -1885,22 +1963,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tempfile" -version = "3.16.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1914,11 +1991,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.17", ] [[package]] @@ -1929,44 +2006,56 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "time" -version = "0.3.37" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ - "deranged", + "deranged 0.5.4", + "itoa", "num-conv", "powerfmt", "serde", "time-core", + "time-macros", ] [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -1974,54 +2063,48 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" dependencies = [ - "serde", + "serde_core", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_writer", ] [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" dependencies = [ - "serde", + "serde_core", ] [[package]] -name = "toml_edit" -version = "0.22.23" +name = "toml_writer" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", -] +checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" [[package]] name = "typenum" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -2031,9 +2114,9 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unindent" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] name = "untrusted" @@ -2054,26 +2137,21 @@ dependencies = [ "rustls", "rustls-pki-types", "url", - "webpki-roots", + "webpki-roots 0.26.11", ] [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -2088,11 +2166,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.12.1" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.3.4", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -2113,50 +2193,51 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.13.3+wasi-0.2.2" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2164,22 +2245,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -2196,9 +2277,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.8" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.3", +] + +[[package]] +name = "webpki-roots" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8" dependencies = [ "rustls-pki-types", ] @@ -2221,11 +2311,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2236,11 +2326,61 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.52.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", ] [[package]] @@ -2249,7 +2389,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2258,7 +2398,25 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -2267,14 +2425,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2283,42 +2458,84 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -2326,34 +2543,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "wit-bindgen-rt" -version = "0.33.0" +name = "windows_x86_64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" -dependencies = [ - "bitflags", -] +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] -name = "write16" -version = "1.0.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "xattr" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "linux-raw-sys", "rustix", ] @@ -2368,9 +2581,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -2380,13 +2593,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", "synstructure", ] @@ -2402,11 +2615,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.14" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ - "zerocopy-derive 0.8.14", + "zerocopy-derive 0.8.27", ] [[package]] @@ -2417,46 +2630,46 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "zerocopy-derive" -version = "0.8.14" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] @@ -2469,14 +2682,25 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", ] [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", @@ -2485,20 +2709,20 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.106", ] [[package]] name = "zip" -version = "2.3.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e9a772a54b54236b9b744aaaf8d7be01b4d6e99725523cb82cb32d1c81b1d7" +checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ "aes", "arbitrary", @@ -2509,19 +2733,19 @@ dependencies = [ "deflate64", "displaydoc", "flate2", - "getrandom 0.3.1", + "getrandom 0.3.4", "hmac", "indexmap", "lzma-rs", "memchr", "pbkdf2", "sha1", - "thiserror 2.0.11", + "thiserror 2.0.17", "time", "xz2", "zeroize", "zopfli", - "zstd 0.13.2", + "zstd 0.13.3", ] [[package]] @@ -2543,15 +2767,13 @@ dependencies = [ [[package]] name = "zopfli" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" dependencies = [ "bumpalo", "crc32fast", - "lockfree-object-pool", "log", - "once_cell", "simd-adler32", ] @@ -2566,11 +2788,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.2.4", ] [[package]] @@ -2585,18 +2807,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/arx/Cargo.toml b/arx/Cargo.toml index d0d8198..0966ab2 100644 --- a/arx/Cargo.toml +++ b/arx/Cargo.toml @@ -41,6 +41,8 @@ tempfile = "3.8.0" format-bytes = "0.3.0" filetime = "0.2.25" rustest = "0.3.1" +walkdir = "2.4.0" +relative-path = "2.0.1" [features] default = ["zstd", "fuse"] diff --git a/arx/src/create.rs b/arx/src/create.rs index ac24a5e..47c24db 100644 --- a/arx/src/create.rs +++ b/arx/src/create.rs @@ -57,6 +57,17 @@ Listing in file list and --follow-symlink passed to arx, you must be cohe Follow symlink all the time or never. If you don't, you may have incoherent state when symlink are pointing to directories. +Triming path + +By default, arx trim input path and remove any parent parts. This can be changed with the --keep-parents +option, in this case the path given as input is fully add to the archive. + +Absolute path are always trimmed of its first part to become a relative path. + +The option --dir_as_root makes arx trim the directory itself. So (if recursion is activated) all entries +in the given directory as place at root of the created archive. +This option has no effect if the input path is a file. + Compression detection/selection: Arx automatically detect if a content should be compressed or not based on a heuristic using @@ -88,10 +99,6 @@ pub struct Options { )] outfile: Option, - /// Remove STRIP_PREFIX from the entries' name added to the archive. - #[arg(long, required = false, value_hint=ValueHint::DirPath, help_heading="Input options")] - strip_prefix: Option, - /// Move to BASE_DIR before starting adding content to arx archive. /// /// Argument `INFILES` or `STRIP_PREFIX` must be relative to `BASE_DIR`. @@ -100,6 +107,22 @@ pub struct Options { #[arg(short = 'C', required = false, value_hint=ValueHint::DirPath, verbatim_doc_comment, help_heading="Input options")] base_dir: Option, + /// Keep N parents from given path. + /// + /// If N > number of parent in the path, keep the path full. + #[arg(short = 'k', long, required = false, default_value_t = Default::default())] + keep_parents: bool, + + /// Input dir are considered as root directory. + /// + /// Directories given in input are considered as root directory. + /// This means we add file/directory in the given directory directly in the root of arx archive. + /// If input is a file, this options has no effect. + /// If several directories are given, they are all considered as root. However, as it is not possible to have + /// duplicated entries in an arx achive, the directories must be disjoint. + #[arg(long, required = false, default_value_t = false)] + dir_as_root: bool, + /// Input files/directories /// /// This is an option incompatible with `FILE_LIST.` @@ -275,11 +298,6 @@ pub fn create(options: Options) -> Result<()> { return Ok(()); } - let strip_prefix = match &options.strip_prefix { - Some(s) => s.clone(), - None => arx::PathBuf::new(), - }; - let out_file = options.outfile.as_ref().expect( "Clap unsure it is Some, except if we have list_compressions, and so we return early", ); @@ -312,6 +330,13 @@ pub fn create(options: Options) -> Result<()> { options.compression, )?; + let mut adder = arx::create::FsAdder::new( + &mut creator, + options.keep_parents, + options.follow_symlink, + options.dir_as_root, + ); + if let Some(file_list) = file_list { let file = File::open(&file_list) .with_context(|| format!("Cannot open {}", file_list.display()))?; @@ -319,25 +344,12 @@ pub fn create(options: Options) -> Result<()> { .lines() .map(|l| -> Result { Ok(l?.into()) }) .collect::>>()?; - let mut list_adder = arx::create::FsAdder::new(&mut creator, strip_prefix); - list_adder.add_from_list(files_list.into_iter(), options.follow_symlink)?; + adder.add_from_list(files_list.into_iter())?; } else { - let files_list = options - .infiles - .iter() - .map(|f| -> Result { - if f.is_absolute() { - Err(anyhow!("Input file ({}) must be relative.", f.display())) - } else { - Ok(f.clone()) - } - }) - .collect::>>()?; - check_input_paths_exist(&files_list)?; - let mut fs_adder = arx::create::FsAdder::new(&mut creator, strip_prefix); - for infile in files_list { + check_input_paths_exist(&options.infiles)?; + for infile in options.infiles { debug!("Adding file {infile:?}"); - fs_adder.add_from_path(&infile, options.recurse)?; + adder.add_from_path(&infile, options.recurse)?; } }; diff --git a/arx/tests/create.rs b/arx/tests/create.rs index 23b525b..2a43971 100644 --- a/arx/tests/create.rs +++ b/arx/tests/create.rs @@ -21,25 +21,177 @@ fn test_crate_non_existant_input() -> Result { fn test_crate_non_existant_output_directory(source_dir: SharedTestDir) -> Result { let source_dir = source_dir.path(); temp_arx!(arx_file, "non_existant_directory/test.arx"); + cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( + b"", + &format_bytes!( + b"Error : Directory {} doesn't exist\n", + arx_file.parent().unwrap().as_os_str().as_encoded_bytes() + ), + ); + assert!(!arx_file.exists()); + Ok(()) +} + +#[test] +fn test_crate_dir_as_root(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + let status = run!( + status, + "arx", + "create", + "--outfile", + &arx_file, + join!(source_dir / "sub_dir_a"), + "--dir-as-root" + ); + assert!(status.success()); + let arx_content = run!(output, "arx", "list", &arx_file); + let arx_content = String::from_utf8_lossy(&arx_content.stdout); + let arx_content = arx_content.lines().collect::>(); + + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a"), + join!(source_dir / "sub_dir_a"), + )?); + Ok(()) +} + +#[test] +fn test_crate_trim(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + run!( + status, + "arx", + "create", + "--outfile", + &arx_file, + join!(source_dir / "sub_dir_a") + ); + let arx_content = run!(output, "arx", "list", &arx_file); + let arx_content = String::from_utf8_lossy(&arx_content.stdout); + let arx_content = arx_content.lines().collect::>(); + + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a"), + source_dir + )?); + Ok(()) +} + +#[test] +fn test_crate_keep(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + let current_dir = source_dir.parent().unwrap(); + let dir_to_add = join!(source_dir / "sub_dir_a"); + let relative_path = dir_to_add.strip_prefix(current_dir).unwrap(); + cmd!( + "arx", + "create", + "--outfile", + &arx_file, + &relative_path, + "-k" + ) + .current_dir(current_dir) + .status()?; + let arx_content = run!(output, "arx", "list", &arx_file); + let arx_content = String::from_utf8_lossy(&arx_content.stdout); + let arx_content = arx_content.lines().collect::>(); + + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a"), + source_dir.parent().unwrap() + )?); + Ok(()) +} + +#[test] +fn test_crate_several_input(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + let dir_a_to_add = join!(source_dir / "sub_dir_a"); + let dir_b_to_add = join!(source_dir / "sub_dir_b"); + let file_c_to_add = join!(source_dir / "sub_dir_c" / "existing_file"); + run!( + status, + "arx", + "create", + "--outfile", + &arx_file, + &dir_a_to_add, + &dir_b_to_add, + &file_c_to_add + ); + let arx_content = run!(output, "arx", "list", &arx_file); + let arx_content = String::from_utf8_lossy(&arx_content.stdout); + let arx_content = arx_content.lines().collect::>(); + + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a"), + source_dir + )?); + Ok(()) +} + +#[test] +fn test_crate_several_input_root_as_dir(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + let dir_a_to_add = join!(source_dir / "sub_dir_a"); + let dir_b_to_add = join!(source_dir / "sub_dir_a_bis"); + run!( + status, + "arx", + "create", + "--outfile", + &arx_file, + &dir_a_to_add, + &dir_b_to_add, + "--dir-as-root" + ); + let arx_content = run!(output, "arx", "list", &arx_file); + let arx_content = String::from_utf8_lossy(&arx_content.stdout); + let arx_content = arx_content.lines().collect::>(); + + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a"), + join!(source_dir / "sub_dir_a"), + )?); + assert!(list_diff( + &arx_content, + join!(source_dir / "sub_dir_a_bis"), + join!(source_dir / "sub_dir_a_bis"), + )?); + Ok(()) +} + +#[test] +fn test_crate_several_input_root_as_dir_duplicate(source_dir: SharedTestDir) -> Result { + let source_dir = source_dir.path(); + temp_arx!(arx_file); + let dir_a_to_add = join!(source_dir / "sub_dir_a"); + let dir_b_to_add = join!(source_dir / "sub_dir_b"); cmd!( "arx", "create", "--outfile", &arx_file, - "-C", - source_dir.parent().unwrap(), - "--strip-prefix", - source_dir.file_name().unwrap(), - source_dir.file_name().unwrap() + &dir_a_to_add, + &dir_b_to_add, + "--dir-as-root" ) .check_fail( b"", - &format_bytes!( - b"Error : Directory {} doesn't exist\n", - arx_file.parent().unwrap().as_os_str().as_encoded_bytes() - ), + b"Error : Incoherent structure : Adding file0.bin, cannot add a file when one already exists\n", ); - assert!(!arx_file.exists()); Ok(()) } @@ -54,18 +206,7 @@ fn test_crate_existant_output(source_dir: SharedTestDir) -> Result { } // Try to write without --force - cmd!( - "arx", - "create", - "--outfile", - &arx_file, - "-C", - source_dir.parent().unwrap(), - "--strip-prefix", - source_dir.file_name().unwrap(), - source_dir.file_name().unwrap() - ) - .check_fail( + cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( b"", &format_bytes!( b"Error : File {} already exists. Use option --force to overwrite it.\n", @@ -80,11 +221,7 @@ fn test_crate_existant_output(source_dir: SharedTestDir) -> Result { "create", "--outfile", &arx_file, - "-C", - source_dir.parent().unwrap(), - "--strip-prefix", - source_dir.file_name().unwrap(), - source_dir.file_name().unwrap(), + source_dir, "--force" ) .check_output(Some(b""), Some(b"")); diff --git a/arx/tests/extract_mount.rs b/arx/tests/extract_mount.rs index caff0cb..4efbd88 100644 --- a/arx/tests/extract_mount.rs +++ b/arx/tests/extract_mount.rs @@ -38,11 +38,8 @@ fn BaseArxFile(source_dir: SharedTestDir) -> TmpArx { "create", "--outfile", &tmp_arx, - "-C", - source_dir.parent().unwrap(), - "--strip-prefix", - source_dir.file_name().unwrap(), - source_dir.file_name().unwrap() + source_dir, + "--dir-as-root" ) .check_output(Some(b""), Some(b"")); TmpArx::new(tmp_arx_dir, tmp_arx) diff --git a/arx/tests/utils/mod.rs b/arx/tests/utils/mod.rs index 7f16c19..67492be 100644 --- a/arx/tests/utils/mod.rs +++ b/arx/tests/utils/mod.rs @@ -6,7 +6,7 @@ use rand::prelude::*; #[allow(unused_imports)] pub use tree_diff::{ - tree_diff, Differ, ExceptionDiffer, ExistingExpected, SimpleDiffer, TreeEntry, + list_diff, tree_diff, Differ, ExceptionDiffer, ExistingExpected, SimpleDiffer, TreeEntry, }; #[cfg(unix)] @@ -256,10 +256,17 @@ pub fn SharedTestDir() -> std::io::Result { loop (10..50) { text "file{ctx}.txt" (500..1000) }, loop (10..50) { bin "file{ctx}.bin" (500..1000) } }, + dir "sub_dir_a_bis" { + text "existing_file2" 50, + link "existing_link2" -> "existing_file2", + }, dir "sub_dir_b" { loop 10 { bin "file{ctx}.bin" (5000..10000) }, loop 10 { link "link_to_file{ctx}" -> "file{ctx}.bin" }, }, + dir "sub_dir_c" { + text "existing_file" 50, + }, link_dir "sub_dir_link" -> "sub_dir_b", dir "empty_sub_dir" {}, loop dir_ctx=(1..5) { diff --git a/arx/tests/utils/tree_diff.rs b/arx/tests/utils/tree_diff.rs index 0e7a2ae..72496df 100644 --- a/arx/tests/utils/tree_diff.rs +++ b/arx/tests/utils/tree_diff.rs @@ -354,3 +354,26 @@ pub fn tree_diff( ); Ok(differ.result()) } + +pub fn list_diff( + tested_content: &[&str], + reference: impl AsRef, + root: impl AsRef, +) -> std::io::Result { + let walker = walkdir::WalkDir::new(reference.as_ref()); + let walker = walker.into_iter(); + for entry in walker { + let entry = entry?; + if entry.path() == root.as_ref() { + continue; + } + let entry_path = entry.path().strip_prefix(root.as_ref()).unwrap(); + let entry_path = relative_path::RelativePathBuf::from_path(&entry_path).unwrap(); + if !tested_content.contains(&entry_path.as_str()) { + println!("{entry_path:?} is not in archive"); + println!("{tested_content:?}"); + return Ok(false); + } + } + Ok(true) +} diff --git a/libarx/src/create/fs_adder.rs b/libarx/src/create/fs_adder.rs index 8a1bd97..085c93a 100644 --- a/libarx/src/create/fs_adder.rs +++ b/libarx/src/create/fs_adder.rs @@ -8,7 +8,7 @@ use std::os::unix::fs::MetadataExt; #[cfg(windows)] use std::os::windows::fs::MetadataExt; use std::path::PathBuf; -use std::{io::Cursor, sync::mpsc, thread::spawn}; +use std::{borrow::Cow, io::Cursor, sync::mpsc, thread::spawn}; #[derive(Debug)] pub enum FsEntryKind { @@ -142,16 +142,84 @@ impl EntryTrait for FsEntry { } } +struct Trimer<'a>(Option<&'a std::path::Path>); + +impl<'a> Trimer<'a> { + fn new(keep_parent: bool, p: &'a std::path::Path) -> Self { + if keep_parent { + if p.is_absolute() { + let mut components = p.components(); + let root_prefix = components + .next() + .expect("Absolute path should have at least a component."); + Trimer(Some(std::path::Path::new(root_prefix.as_os_str()))) + } else { + Trimer(None) + } + } else { + let mut ancestors = p.ancestors(); + ancestors.next(); + let parent_to_strip = ancestors.next(); + Trimer(parent_to_strip) + } + } + fn trim<'s, 'p>(&'s self, path: &'p std::path::Path) -> &'p std::path::Path { + if let Some(prefix) = self.0 { + path.strip_prefix(prefix) + .expect("Prefix should be a prefix of entry.path()") + } else { + path + } + } +} + +fn to_arx_path(path: &std::path::Path) -> Result, InputError> { + let ret = match crate::Path::from_path(path) { + Ok(p) => Ok(p.into()), + Err(e) => { + if let relative_path::FromPathErrorKind::BadSeparator = e.kind() { + crate::PathBuf::from_path(path).map(|p| p.into()) + } else { + Err(e) + } + } + }; + ret.map_err(|e| match e.kind() { + relative_path::FromPathErrorKind::NonRelative => { + InputError(format!("{} is not a relative path", path.display())) + } + relative_path::FromPathErrorKind::NonUtf8 => { + InputError(format!("Non utf8 char in {}", path.display())) + } + relative_path::FromPathErrorKind::BadSeparator => { + InputError(format!("Invalid path separator in {}", path.display())) + } + _ => InputError(format!( + "Unknown error converting {} to relative utf-8 path.", + path.display() + )), + }) +} + pub struct FsAdder<'a> { creator: &'a mut SimpleCreator, - strip_prefix: crate::PathBuf, + keep_parents: bool, + follow_symlink: bool, + dir_as_root: bool, } impl<'a> FsAdder<'a> { - pub fn new(creator: &'a mut SimpleCreator, strip_prefix: crate::PathBuf) -> Self { + pub fn new( + creator: &'a mut SimpleCreator, + keep_parents: bool, + follow_symlink: bool, + dir_as_root: bool, + ) -> Self { Self { creator, - strip_prefix, + keep_parents, + follow_symlink, + dir_as_root, } } @@ -172,9 +240,11 @@ impl<'a> FsAdder<'a> { log::trace!("add_from_path_with_filter(path:{path:?}, recurse:{recurse})"); let (tx, rx) = mpsc::channel(); let path_copy = path.to_path_buf(); + let follow_symlink = self.follow_symlink; + let trimmer = Trimer::new(self.keep_parents, path); spawn(move || { - let mut walker = walkdir::WalkDir::new(path_copy); + let mut walker = walkdir::WalkDir::new(path_copy).follow_links(follow_symlink); if !recurse { walker = walker.max_depth(0); @@ -191,59 +261,52 @@ impl<'a> FsAdder<'a> { // This allow user to create a link to a file/dir to add the entry under a different name. // Walkdir will do the same anyway if it is a directory. let is_root_entry = entry.path() == path; - - self.add_entry_from_path(entry.path(), is_root_entry)?; + let entry_path = if self.dir_as_root { + if is_root_entry { + continue; + } + entry + .path() + .strip_prefix(path) + .expect("Entry path is a chird of path") + } else { + trimmer.trim(entry.path()) + }; + let arx_path = to_arx_path(entry_path)?; + self.add_entry_from_path(entry.path(), &arx_path, is_root_entry)?; } Ok(()) } - pub fn add_from_list(&mut self, paths: Iter, follow_symlink: bool) -> Void + pub fn add_from_list(&mut self, paths: Iter) -> Void where Iter: Iterator, { for path in paths { - self.add_entry_from_path(&path, follow_symlink)?; + let trimer = Trimer::new(self.keep_parents, &path); + let arx_path = trimer.trim(&path); + let arx_path = to_arx_path(arx_path)?; + self.add_entry_from_path(&path, &arx_path, false)?; } Ok(()) } - pub fn add_entry_from_path(&mut self, path: &std::path::Path, follow_symlink: bool) -> Void { - log::debug!("add_path(path:{path:?}, follow_symlink:{follow_symlink})"); - - let arx_path = match crate::PathBuf::from_path(path) { - Ok(p) => p, - Err(e) => { - return Err(match e.kind() { - relative_path::FromPathErrorKind::NonRelative => { - InputError(format!("{} is not a relative path", path.display())) - } - relative_path::FromPathErrorKind::NonUtf8 => { - InputError(format!("Non utf8 char in {}", path.display())) - } - relative_path::FromPathErrorKind::BadSeparator => { - InputError(format!("Invalid path separator in {}", path.display())) - } - _ => InputError(format!( - "Unknown error converting {} to relative utf-8 path.", - path.display() - )), - } - .into()) - } - }; - let arx_path: crate::PathBuf = match arx_path.strip_prefix(&self.strip_prefix) { - Ok(p) => p, - Err(_e) => { - return Err( - InputError(format!("{} is not in {arx_path}", self.strip_prefix)).into(), - ) - } - } - .into(); + pub fn add_entry_from_path( + &mut self, + path: &std::path::Path, + arx_path: &crate::Path, + is_root_dir: bool, + ) -> Void { + log::debug!("add_path(path:{path:?}, arx_path: {arx_path:?}, is_root_dir:{is_root_dir})"); if arx_path.as_str().is_empty() { return Ok(()); } - let entry = FsEntry::new_from_path(path, arx_path, self.creator.adder(), follow_symlink)?; + let entry = FsEntry::new_from_path( + path, + arx_path.into(), + self.creator.adder(), + self.follow_symlink || is_root_dir, + )?; self.creator.add_entry(entry.as_ref()) } diff --git a/python/src/creator.rs b/python/src/creator.rs index afe90f6..ed4f66a 100644 --- a/python/src/creator.rs +++ b/python/src/creator.rs @@ -68,8 +68,8 @@ impl Creator { /// Add the file `name` to the archive. `name` may be any type of file (directory, symlink, regular file). /// Directory are added recursively by default. This cane be avoided by setting `recursive` to `False` - #[pyo3(signature=(path, recursive=true))] - fn add(&mut self, path: PathBuf, recursive: bool) -> PyResult<()> { + #[pyo3(signature=(path, recursive=true, keep_parents=false))] + fn add(&mut self, path: PathBuf, recursive: bool, keep_parents: bool) -> PyResult<()> { match self.creator.as_mut() { None => Err(PyRuntimeError::new_err("Creator already finalized")), Some(creator) => { @@ -78,7 +78,7 @@ impl Creator { "add method must be used inside a context manager", )); } - let mut adder = FsAdder::new(creator, "".into()); + let mut adder = FsAdder::new(creator, keep_parents, false, false); adder .add_from_path(path, recursive) .map_err(|e| PyRuntimeError::new_err(e.to_string())) From eb098c0629327b6e5642f9cd8208e16d5cc62b78 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 14:05:51 +0200 Subject: [PATCH 2/6] feat!: Option recurse is on by default. --- arx/src/create.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arx/src/create.rs b/arx/src/create.rs index 47c24db..9846fdd 100644 --- a/arx/src/create.rs +++ b/arx/src/create.rs @@ -18,13 +18,11 @@ const AFTER_HELP: &str = cstr!( The command format is : $ arx -o my_archive.arx input_file1 input_file2 input_dir1 ... -In this mode, --recurse is true by default. From list file ([FILE_LIST]) The command format is : $ arx -o my_archive.arx -L file_list.txt -In this mode, --recurse is false by default. File list can be generated this way : $ find input_dir > file_list.txt @@ -154,13 +152,11 @@ pub struct Options { short, long, required = false, - default_value_t = false, - default_value_ifs([ - ("no_recurse", clap::builder::ArgPredicate::IsPresent, "false"), - ("infiles", clap::builder::ArgPredicate::IsPresent, "true") - ]), + default_value_t = true, + default_value_if("no_recurse", clap::builder::ArgPredicate::IsPresent, "false"), conflicts_with = "no_recurse", - action, help_heading="Input options" + action, + help_heading = "Input options" )] recurse: bool, From 4035e312c305f6f462ca60894d7308fb4d23931b Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 14:08:20 +0200 Subject: [PATCH 3/6] chore: Better usage message about `--follow-symlink` and inconsistency. --- arx/src/create.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arx/src/create.rs b/arx/src/create.rs index 9846fdd..2204cad 100644 --- a/arx/src/create.rs +++ b/arx/src/create.rs @@ -49,11 +49,15 @@ foo/bar.txt ``` (If you've used find to generate the list : don't use -type f option) -About file list and --follow-symlink option - -Listing in file list and --follow-symlink passed to arx, you must be coherent. -Follow symlink all the time or never. -If you don't, you may have incoherent state when symlink are pointing to directories. +About --follow-symlink option + +When passing entries to arx, you must be consistent with --follow-symlink. +One way to be inconsistent is: +1. You have a link (L), pointing to a directory (D) containing a file (D/F). +2. You create a arx passing as input both L and L/F. +3. You don't give --follow-symlink +4. Arx create a symlink L and then try to add the file F to directory L, which is not possible + because L is a symlink. Triming path From 8c7580eefb64731dfe254b4639245b9524844b87 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 14:46:07 +0200 Subject: [PATCH 4/6] test: check_output and check_fail now takes str --- Cargo.lock | 78 +++++++++++--------------------------- arx/Cargo.toml | 1 - arx/tests/create.rs | 27 +++++++------ arx/tests/extract_mount.rs | 40 +++++++++---------- arx/tests/utils/mod.rs | 40 ++++++++----------- 5 files changed, 70 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52c7768..79c9952 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,7 +133,6 @@ dependencies = [ "daemonize", "env_logger", "filetime", - "format-bytes", "git-version", "glob", "human-panic", @@ -360,7 +359,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -397,7 +396,7 @@ dependencies = [ "nom", "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -582,7 +581,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -604,7 +603,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -745,26 +744,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "format-bytes" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48942366ef93975da38e175ac9e10068c6fc08ca9e85930d4f098f4d5b14c2fd" -dependencies = [ - "format-bytes-macros", -] - -[[package]] -name = "format-bytes-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203aadebefcc73d12038296c228eabf830f99cba991b0032adf20e9fa6ce7e4f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "fuser" version = "0.16.0" @@ -848,7 +827,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1107,7 +1086,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1565,7 +1544,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1578,7 +1557,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1739,7 +1718,7 @@ checksum = "a82be781069eaf509640d1cb7d8ddf2195b0bd41737ffacd42e6489d16adcdfe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1832,7 +1811,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1897,17 +1876,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.106" @@ -1927,7 +1895,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2006,7 +1974,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2017,7 +1985,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2229,7 +2197,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-shared", ] @@ -2251,7 +2219,7 @@ checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2345,7 +2313,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2356,7 +2324,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2599,7 +2567,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "synstructure", ] @@ -2630,7 +2598,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2641,7 +2609,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2661,7 +2629,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "synstructure", ] @@ -2682,7 +2650,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2715,7 +2683,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] diff --git a/arx/Cargo.toml b/arx/Cargo.toml index 0966ab2..d642238 100644 --- a/arx/Cargo.toml +++ b/arx/Cargo.toml @@ -38,7 +38,6 @@ daemonize = "0.5.0" rand = { version = "0.8.5", features = ["small_rng"]} lipsum = "0.9.0" tempfile = "3.8.0" -format-bytes = "0.3.0" filetime = "0.2.25" rustest = "0.3.1" walkdir = "2.4.0" diff --git a/arx/tests/create.rs b/arx/tests/create.rs index 2a43971..c3fbaf9 100644 --- a/arx/tests/create.rs +++ b/arx/tests/create.rs @@ -2,7 +2,6 @@ mod utils; use rustest::{test, *}; -use format_bytes::format_bytes; use std::{io::Read, path::Path}; use utils::*; @@ -10,8 +9,8 @@ use utils::*; fn test_crate_non_existant_input() -> Result { temp_arx!(arx_file); cmd!("arx", "create", "--outfile", &arx_file, "non_existant_dir").check_fail( - b"", - b"Error : Input non_existant_dir path doesn't exist or cannot be accessed\n", + "", + "Error : Input non_existant_dir path doesn't exist or cannot be accessed\n", ); assert!(!arx_file.exists()); Ok(()) @@ -22,10 +21,10 @@ fn test_crate_non_existant_output_directory(source_dir: SharedTestDir) -> Result let source_dir = source_dir.path(); temp_arx!(arx_file, "non_existant_directory/test.arx"); cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( - b"", - &format_bytes!( - b"Error : Directory {} doesn't exist\n", - arx_file.parent().unwrap().as_os_str().as_encoded_bytes() + "", + &format!( + "Error : Directory {} doesn't exist\n", + arx_file.parent().unwrap().to_str().unwrap() ), ); assert!(!arx_file.exists()); @@ -189,8 +188,8 @@ fn test_crate_several_input_root_as_dir_duplicate(source_dir: SharedTestDir) -> "--dir-as-root" ) .check_fail( - b"", - b"Error : Incoherent structure : Adding file0.bin, cannot add a file when one already exists\n", + "", + "Error : Incoherent structure : Adding file0.bin, cannot add a file when one already exists\n", ); Ok(()) } @@ -207,10 +206,10 @@ fn test_crate_existant_output(source_dir: SharedTestDir) -> Result { // Try to write without --force cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( - b"", - &format_bytes!( - b"Error : File {} already exists. Use option --force to overwrite it.\n", - arx_file.as_os_str().as_encoded_bytes() + "", + &format!( + "Error : File {} already exists. Use option --force to overwrite it.\n", + arx_file.to_str().unwrap() ), ); assert_eq!(std::fs::read(&arx_file)?, b"Some dummy content"); @@ -224,7 +223,7 @@ fn test_crate_existant_output(source_dir: SharedTestDir) -> Result { source_dir, "--force" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); { let mut f = std::fs::File::open(&arx_file)?; let mut buf = [0; 10]; diff --git a/arx/tests/extract_mount.rs b/arx/tests/extract_mount.rs index 4efbd88..fe31f89 100644 --- a/arx/tests/extract_mount.rs +++ b/arx/tests/extract_mount.rs @@ -2,7 +2,6 @@ mod utils; use rustest::{test, *}; -use format_bytes::format_bytes; use std::{ ffi::OsStr, path::{Path, PathBuf}, @@ -41,7 +40,7 @@ fn BaseArxFile(source_dir: SharedTestDir) -> TmpArx { source_dir, "--dir-as-root" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); TmpArx::new(tmp_arx_dir, tmp_arx) } @@ -138,8 +137,8 @@ fn test_extract_same_dir(arx_file: BaseArxFile) -> Result { let arx_file = arx_file.path(); let extract_dir = tempfile::TempDir::with_prefix_in("extract_", env!("CARGO_TARGET_TMPDIR"))?; - cmd!("arx", "extract", arx_file, "-C", extract_dir.path()).check_output(Some(b""), Some(b"")); - cmd!("arx", "extract", arx_file, "-C", extract_dir.path()).check_output(Some(b""), None); + cmd!("arx", "extract", arx_file, "-C", extract_dir.path()).check_output(Some(""), Some("")); + cmd!("arx", "extract", arx_file, "-C", extract_dir.path()).check_output(Some(""), None); Ok(()) } @@ -155,7 +154,7 @@ fn test_extract_filter(source_dir: SharedTestDir, arx_file: BaseArxFile) -> Resu "--glob", "sub_dir_a/**" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); let source_sub_dir = join!((source_dir.path()) / "sub_dir_a"); let extract_sub_dir = join!(extract_dir / "sub_dir_a"); @@ -181,7 +180,7 @@ fn test_extract_subdir(source_dir: SharedTestDir, arx_file: BaseArxFile) -> Resu "-C", extract_dir.path() ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); let source_sub_dir = join!((source_dir.path()) / "sub_dir_a"); @@ -202,7 +201,7 @@ fn test_extract_subfile(arx_file: BaseArxFile) -> Result { "-C", extract_dir.path() ) - .check_fail(b"", b"Error : sub_dir_a/file1.txt must be a directory\n"); + .check_fail("", "Error : sub_dir_a/file1.txt must be a directory\n"); Ok(()) } @@ -224,7 +223,7 @@ fn test_extract_existing_content_skip(source_dir: SharedTestDir, arx_file: BaseA extract_dir.path(), "--overwrite=skip" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); assert!(tree_diff( extract_dir, source_dir.path(), @@ -261,17 +260,15 @@ fn test_extract_existing_content_warn(source_dir: SharedTestDir, arx_file: BaseA "--overwrite=warn" ) .check_output( - Some(b""), - Some(&format_bytes!( - b"File {} already exists.\nLink {} already exists.\n", + Some(""), + Some(&format!( + "File {} already exists.\nLink {} already exists.\n", join!(extract_dir / "sub_dir_a" / "existing_file") .to_str() - .unwrap() - .as_bytes(), + .unwrap(), join!(extract_dir / "sub_dir_a" / "existing_link") .to_str() .unwrap() - .as_bytes() )), ); assert!(tree_diff( @@ -322,7 +319,7 @@ fn test_extract_existing_content_newer_true( extract_dir.path(), "--overwrite=newer" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); assert!(tree_diff( extract_dir, source_dir.path(), @@ -354,7 +351,7 @@ fn test_extract_existing_content_newer_false( extract_dir.path(), "--overwrite=newer" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); assert!(tree_diff( extract_dir, source_dir.path(), @@ -392,7 +389,7 @@ fn test_extract_existing_content_overwrite( extract_dir.path(), "--overwrite=overwrite" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); assert!(tree_diff( extract_dir, source_dir.path(), @@ -419,13 +416,12 @@ fn test_extract_existing_content_error(source_dir: SharedTestDir, arx_file: Base "--overwrite=error" ) .check_fail( - b"", - &format_bytes!( - b"Error : File {} already exists.\n", + "", + &format!( + "Error : File {} already exists.\n", join!(extract_dir / "sub_dir_a" / "existing_file") .to_str() .unwrap() - .as_bytes() ), ); assert!(!tree_diff( @@ -451,7 +447,7 @@ fn test_extract_subdir_filter(source_dir: SharedTestDir, arx_file: BaseArxFile) "--glob", "*.txt" ) - .check_output(Some(b""), Some(b"")); + .check_output(Some(""), Some("")); let source_sub_dir = join!((source_dir.path()) / "sub_dir_a"); diff --git a/arx/tests/utils/mod.rs b/arx/tests/utils/mod.rs index 67492be..709a574 100644 --- a/arx/tests/utils/mod.rs +++ b/arx/tests/utils/mod.rs @@ -336,55 +336,47 @@ macro_rules! temp_arx { #[allow(dead_code)] pub trait CheckCommand { - fn check_fail(&mut self, stdout: &[u8], stderr: &[u8]); - fn check_output(&mut self, stdout: Option<&[u8]>, stderr: Option<&[u8]>); + fn check_fail(&mut self, stdout: &str, stderr: &str); + fn check_output(&mut self, stdout: Option<&str>, stderr: Option<&str>); fn check(&mut self); } impl CheckCommand for Command { - fn check_output(&mut self, stdout: Option<&[u8]>, stderr: Option<&[u8]>) { + fn check_output(&mut self, stdout: Option<&str>, stderr: Option<&str>) { let output = self.output().expect("Running command should work."); let mut success = output.status.success(); + let output_stdout = String::from_utf8_lossy(&output.stdout); + let output_stderr = String::from_utf8_lossy(&output.stderr); if let Some(stdout) = stdout { - success &= output.stdout == stdout + success &= output_stdout == stdout } if let Some(stderr) = stderr { - success &= output.stderr == stderr + success &= output_stderr == stderr } if !success { println!("Command failed. Status is {}", output.status); if let Some(stdout) = stdout { - println!( - "Output is {}\nExpected is {}", - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(stdout) - ); + println!("Output is {}\nExpected is {}", output_stdout, stdout); } if let Some(stderr) = stderr { - println!( - "Err is {}\nExpected is {}", - String::from_utf8_lossy(&output.stderr), - String::from_utf8_lossy(stderr) - ); + println!("Err is {}\nExpected is {}", output_stderr, stderr); } panic!("Running command {self:?} fails.") } } - fn check_fail(&mut self, stdout: &[u8], stderr: &[u8]) { + fn check_fail(&mut self, stdout: &str, stderr: &str) { let output = self.output().expect("Running command should work."); + let output_stdout = String::from_utf8_lossy(&output.stdout); + let output_stderr = String::from_utf8_lossy(&output.stderr); assert_eq!( - output.stdout, - stdout, + output_stdout, stdout, "Output is {}\nExpected is {}", - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(stdout), + output_stdout, stdout, ); assert_eq!( - output.stderr, - stderr, + output_stderr, stderr, "Err is {}\nExpected is {}", - String::from_utf8_lossy(&output.stderr), - String::from_utf8_lossy(stderr) + output_stderr, stderr ); assert!(!output.status.success()); } From 8a96b4cf624561bd78addad697fafb19f200adef Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 15:40:16 +0200 Subject: [PATCH 5/6] test: Use regex to check stdout and stderr --- Cargo.lock | 33 +++++++++++++++++++++++++++++++++ arx/Cargo.toml | 1 + arx/tests/create.rs | 8 ++++---- arx/tests/extract_mount.rs | 8 ++++---- arx/tests/utils/mod.rs | 23 +++++++++++++++-------- 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79c9952..b66bb18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,15 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "allocator-api2" version = "0.2.21" @@ -143,6 +152,7 @@ dependencies = [ "lipsum", "log", "rand", + "regex", "relative-path 2.0.1", "rustest", "tempfile", @@ -1652,11 +1662,34 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + [[package]] name = "regex-automata" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "relative-path" diff --git a/arx/Cargo.toml b/arx/Cargo.toml index d642238..c902ffe 100644 --- a/arx/Cargo.toml +++ b/arx/Cargo.toml @@ -42,6 +42,7 @@ filetime = "0.2.25" rustest = "0.3.1" walkdir = "2.4.0" relative-path = "2.0.1" +regex = "1.12.2" [features] default = ["zstd", "fuse"] diff --git a/arx/tests/create.rs b/arx/tests/create.rs index c3fbaf9..a04c58b 100644 --- a/arx/tests/create.rs +++ b/arx/tests/create.rs @@ -22,10 +22,10 @@ fn test_crate_non_existant_output_directory(source_dir: SharedTestDir) -> Result temp_arx!(arx_file, "non_existant_directory/test.arx"); cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( "", - &format!( + ®ex::escape(&format!( "Error : Directory {} doesn't exist\n", arx_file.parent().unwrap().to_str().unwrap() - ), + )), ); assert!(!arx_file.exists()); Ok(()) @@ -207,10 +207,10 @@ fn test_crate_existant_output(source_dir: SharedTestDir) -> Result { // Try to write without --force cmd!("arx", "create", "--outfile", &arx_file, source_dir).check_fail( "", - &format!( + ®ex::escape(&format!( "Error : File {} already exists. Use option --force to overwrite it.\n", arx_file.to_str().unwrap() - ), + )), ); assert_eq!(std::fs::read(&arx_file)?, b"Some dummy content"); diff --git a/arx/tests/extract_mount.rs b/arx/tests/extract_mount.rs index fe31f89..26f6e21 100644 --- a/arx/tests/extract_mount.rs +++ b/arx/tests/extract_mount.rs @@ -261,7 +261,7 @@ fn test_extract_existing_content_warn(source_dir: SharedTestDir, arx_file: BaseA ) .check_output( Some(""), - Some(&format!( + Some(®ex::escape(&format!( "File {} already exists.\nLink {} already exists.\n", join!(extract_dir / "sub_dir_a" / "existing_file") .to_str() @@ -269,7 +269,7 @@ fn test_extract_existing_content_warn(source_dir: SharedTestDir, arx_file: BaseA join!(extract_dir / "sub_dir_a" / "existing_link") .to_str() .unwrap() - )), + ))), ); assert!(tree_diff( extract_dir, @@ -417,12 +417,12 @@ fn test_extract_existing_content_error(source_dir: SharedTestDir, arx_file: Base ) .check_fail( "", - &format!( + ®ex::escape(&format!( "Error : File {} already exists.\n", join!(extract_dir / "sub_dir_a" / "existing_file") .to_str() .unwrap() - ), + )), ); assert!(!tree_diff( extract_dir, diff --git a/arx/tests/utils/mod.rs b/arx/tests/utils/mod.rs index 709a574..1ba357f 100644 --- a/arx/tests/utils/mod.rs +++ b/arx/tests/utils/mod.rs @@ -1,4 +1,5 @@ mod tree_diff; +use regex::Regex; use rustest::fixture; use std::{io::Read, path::Path, process::Command}; @@ -348,10 +349,12 @@ impl CheckCommand for Command { let output_stdout = String::from_utf8_lossy(&output.stdout); let output_stderr = String::from_utf8_lossy(&output.stderr); if let Some(stdout) = stdout { - success &= output_stdout == stdout + let regex = Regex::new(stdout).unwrap(); + success &= regex.is_match(&output_stdout) } if let Some(stderr) = stderr { - success &= output_stderr == stderr + let regex = Regex::new(stderr).unwrap(); + success &= regex.is_match(&output_stderr) } if !success { println!("Command failed. Status is {}", output.status); @@ -368,15 +371,19 @@ impl CheckCommand for Command { let output = self.output().expect("Running command should work."); let output_stdout = String::from_utf8_lossy(&output.stdout); let output_stderr = String::from_utf8_lossy(&output.stderr); - assert_eq!( - output_stdout, stdout, + let regex_stdout = Regex::new(stdout).unwrap(); + let regex_stderr = Regex::new(stderr).unwrap(); + assert!( + regex_stdout.is_match(&output_stdout), "Output is {}\nExpected is {}", - output_stdout, stdout, + output_stdout, + stdout, ); - assert_eq!( - output_stderr, stderr, + assert!( + regex_stderr.is_match(&output_stderr), "Err is {}\nExpected is {}", - output_stderr, stderr + output_stderr, + stderr ); assert!(!output.status.success()); } From 478f080d455938807399e93a51afb695433ead35 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 17 Oct 2025 14:53:39 +0200 Subject: [PATCH 6/6] test: Test for any potential file error when duplicate. We don't know in which order we will add the files so we cannot expect file0.bin to fail. --- arx/tests/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arx/tests/create.rs b/arx/tests/create.rs index a04c58b..2905302 100644 --- a/arx/tests/create.rs +++ b/arx/tests/create.rs @@ -189,7 +189,7 @@ fn test_crate_several_input_root_as_dir_duplicate(source_dir: SharedTestDir) -> ) .check_fail( "", - "Error : Incoherent structure : Adding file0.bin, cannot add a file when one already exists\n", + "Error : Incoherent structure : Adding file[0-9].bin, cannot add a file when one already exists\n", ); Ok(()) }