From 8ede87e1cf3b25fc7907c653d333518ac8d9c9ed Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 30 Jan 2026 05:22:39 -0600 Subject: [PATCH] Update dependencies and improve CLI argument handling - Updated various dependencies in Cargo.toml and Cargo.lock, including `env_logger`, `fs-err`, and `clap`, to their latest versions for enhanced functionality and security. - Refactored CLI argument handling in `build.rs` and `mod.rs` to align with the new `clap` version, improving error reporting and verbosity options. - Added new packages such as `anstream`, `colorchoice`, and `jiff` to enhance project capabilities. --- Cargo.lock | 387 +++++++++++++++++++++----------- Cargo.toml | 12 +- crates/memofs/Cargo.toml | 2 +- src/cli/build.rs | 2 +- src/cli/mod.rs | 2 +- src/snapshot/tree.rs | 10 +- src/snapshot_middleware/toml.rs | 4 +- 7 files changed, 267 insertions(+), 152 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bb60bcd..c053155f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,12 +45,56 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.61.2", +] + [[package]] name = "anyhow" version = "1.0.100" @@ -107,18 +151,18 @@ dependencies = [ "windows-link", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bincode" version = "1.3.3" @@ -256,27 +300,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "bitflags 1.3.2", - "textwrap 0.11.0", + "textwrap", "unicode-width", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap 0.16.2", -] - [[package]] name = "clap" version = "4.5.56" @@ -284,6 +311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -292,30 +320,22 @@ version = "4.5.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0" dependencies = [ + "anstream", "anstyle", - "clap_lex 0.7.7", + "clap_lex", + "strsim", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" dependencies = [ - "heck 0.4.1", - "proc-macro-error", + "heck", "proc-macro2 1.0.106", "quote 1.0.44", - "syn 1.0.109", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn", ] [[package]] @@ -324,6 +344,12 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "console" version = "0.15.11" @@ -582,7 +608,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -599,7 +625,7 @@ checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e" dependencies = [ "cc", "rustc_version", - "toml", + "toml 0.5.11", "vswhom", "winreg 0.10.1", ] @@ -620,16 +646,26 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.9.3" +name = "env_filter" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ - "atty", - "humantime", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] @@ -703,9 +739,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.11.0" +version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +checksum = "baf68cef89750956493a66a10f512b9e58d9db21f2a573c079c0bdf1207a54a7" dependencies = [ "autocfg", ] @@ -801,7 +837,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -967,12 +1003,6 @@ dependencies = [ "hashbrown 0.15.5", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1276,6 +1306,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.10.5" @@ -1291,6 +1327,30 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jiff" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.44", + "syn", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -1414,9 +1474,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.5" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" +checksum = "ab6473172471198271ff72e9379150e9dfd70d8e533e0752a27e515b48dd375e" dependencies = [ "twox-hash", ] @@ -1595,6 +1655,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "oorandom" version = "11.1.5" @@ -1617,12 +1683,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "parking_lot" version = "0.12.5" @@ -1688,7 +1748,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -1747,6 +1807,21 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "portable-atomic" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" + +[[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.4" @@ -1775,30 +1850,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2 1.0.106", - "quote 1.0.44", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2 1.0.106", - "quote 1.0.44", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -1846,7 +1897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -1930,7 +1981,7 @@ dependencies = [ "ahash", "criterion 0.5.1", "env_logger", - "heck 0.4.1", + "heck", "insta", "log", "lz4_flex", @@ -1939,7 +1990,7 @@ dependencies = [ "rbx_reflection", "rbx_reflection_database", "serde", - "thiserror", + "thiserror 2.0.18", "zstd", ] @@ -1960,7 +2011,7 @@ version = "6.1.0" dependencies = [ "rbx_types", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1978,7 +2029,7 @@ dependencies = [ name = "rbx_types" version = "3.1.0" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "bincode", "bitflags 1.3.2", "blake3", @@ -1987,7 +2038,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -1995,9 +2046,9 @@ name = "rbx_xml" version = "2.0.1" dependencies = [ "ahash", - "base64 0.13.1", + "base64 0.22.1", "env_logger", - "heck 0.4.1", + "heck", "insta", "log", "rbx_dom_weak", @@ -2032,7 +2083,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2169,7 +2220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "743bb8c693a387f1ae8d2026d82d8b0c175cc4777b97c1f7b12fdb3be595bb13" dependencies = [ "dirs 2.0.2", - "thiserror", + "thiserror 1.0.69", "winreg 0.6.2", ] @@ -2181,7 +2232,7 @@ dependencies = [ "backtrace", "bincode", "blake3", - "clap 3.2.25", + "clap 4.5.56", "criterion 0.3.6", "crossbeam-channel", "csv", @@ -2226,9 +2277,9 @@ dependencies = [ "strum", "tempfile", "termcolor", - "thiserror", + "thiserror 2.0.18", "tokio", - "toml", + "toml 0.8.23", "uuid", "walkdir", "winreg 0.10.1", @@ -2398,7 +2449,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -2414,6 +2465,15 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2530,9 +2590,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -2549,21 +2609,10 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.106", - "quote 1.0.44", - "unicode-ident", + "syn", ] [[package]] @@ -2591,7 +2640,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -2646,19 +2695,22 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" - [[package]] name = "thiserror" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] @@ -2669,7 +2721,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.44", + "syn", ] [[package]] @@ -2724,7 +2787,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -2771,6 +2834,47 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap 2.13.0", + "serde", + "serde_spanned", + "toml_datetime", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "tower-service" version = "0.3.3" @@ -2867,7 +2971,7 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -2951,6 +3055,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.20.0" @@ -3075,7 +3185,7 @@ dependencies = [ "bumpalo", "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", "wasm-bindgen-shared", ] @@ -3393,6 +3503,15 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" +[[package]] +name = "winnow" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.6.2" @@ -3494,7 +3613,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", "synstructure", ] @@ -3515,7 +3634,7 @@ checksum = "7cb7e4e8436d9db52fbd6625dbf2f45243ab84994a72882ec8227b99e72b439a" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] @@ -3535,7 +3654,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", "synstructure", ] @@ -3569,7 +3688,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", - "syn 2.0.114", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ebc5048c..a40dd987 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,8 +60,8 @@ backtrace = "0.3.76" bincode = "1.3.3" crossbeam-channel = "0.5.15" csv = "1.4.0" -env_logger = "0.9.3" -fs-err = "2.11.0" +env_logger = "0.11" +fs-err = "3" futures = "0.3.31" globset = "0.4.18" humantime = "2.3.0" @@ -83,12 +83,12 @@ serde = { version = "1.0.228", features = ["derive", "rc"] } serde_json = "1.0.149" json5 = "1.3.0" strum = { version = "0.27", features = ["derive"] } -toml = "0.5.11" +toml = "0.8" termcolor = "1.4.1" -thiserror = "1.0.69" +thiserror = "2" tokio = { version = "1.49.0", features = ["rt", "rt-multi-thread", "macros"] } uuid = { version = "1.20.0", features = ["v4", "serde"] } -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4", features = ["derive"] } profiling = "1.0.17" yaml-rust2 = "0.10.4" data-encoding = "2.10.0" @@ -108,7 +108,7 @@ memofs = { version = "0.3.0", path = "crates/memofs" } embed-resource = "1.8.0" anyhow = "1.0.100" bincode = "1.3.3" -fs-err = "2.11.0" +fs-err = "3" maplit = "1.0.2" semver = "1.0.27" diff --git a/crates/memofs/Cargo.toml b/crates/memofs/Cargo.toml index 358e9112..4f7841f8 100644 --- a/crates/memofs/Cargo.toml +++ b/crates/memofs/Cargo.toml @@ -16,7 +16,7 @@ homepage = "https://github.com/rojo-rbx/rojo/tree/master/memofs" [dependencies] crossbeam-channel = "0.5.15" -fs-err = "2.11.0" +fs-err = "3" log = "0.4" notify = "4.0.18" serde = { version = "1.0.228", features = ["derive"] } diff --git a/src/cli/build.rs b/src/cli/build.rs index c2ddebb3..0eed78ea 100644 --- a/src/cli/build.rs +++ b/src/cli/build.rs @@ -50,7 +50,7 @@ impl BuildCommand { (None, None) => { BuildCommand::command() .error( - clap::ErrorKind::MissingRequiredArgument, + clap::error::ErrorKind::MissingRequiredArgument, "one of the following arguments must be provided: \n --output \n --plugin ", ) .exit(); diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 7d3d87b1..292e969e 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -56,7 +56,7 @@ impl Options { #[derive(Debug, Parser)] pub struct GlobalOptions { /// Sets verbosity level. Can be specified multiple times. - #[clap(long("verbose"), short, global(true), parse(from_occurrences))] + #[clap(long("verbose"), short, global(true), action = clap::ArgAction::Count)] pub verbosity: u8, /// Set color behavior. Valid values are auto, always, and never. diff --git a/src/snapshot/tree.rs b/src/snapshot/tree.rs index 9abe6917..98dfc13f 100644 --- a/src/snapshot/tree.rs +++ b/src/snapshot/tree.rs @@ -244,16 +244,10 @@ impl RojoTree { // The root of the tree doesn't appear in the path, so we start with // the root's children. - for (i, segment) in segments.iter().enumerate() { + for segment in segments.iter() { let current = self.inner.get_by_ref(current_ref)?; - // For the first segment, check direct children of root - // For subsequent segments, check children of current - let children = if i == 0 { - current.children() - } else { - current.children() - }; + let children = current.children(); let mut found = false; for &child_ref in children { diff --git a/src/snapshot_middleware/toml.rs b/src/snapshot_middleware/toml.rs index 3c42de6c..2b23164b 100644 --- a/src/snapshot_middleware/toml.rs +++ b/src/snapshot_middleware/toml.rs @@ -18,8 +18,10 @@ pub fn snapshot_toml( name: &str, ) -> anyhow::Result> { let contents = vfs.read(path)?; + let contents_str = std::str::from_utf8(&contents) + .with_context(|| format!("File is not valid UTF-8: {}", path.display()))?; - let value: toml::Value = toml::from_slice(&contents) + let value: toml::Value = toml::from_str(contents_str) .with_context(|| format!("File contains malformed TOML: {}", path.display()))?; let as_lua = toml_to_lua(value).to_string();