From fe4a31c2b7e1383799ff366be49560c5cbe1fd1f Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 10 Sep 2025 07:32:07 +0200 Subject: [PATCH] Bump uucore & uutests from 0.1.0 to 0.2.2 --- Cargo.lock | 115 ++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 4 +- 2 files changed, 76 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c78ef2..a48f2cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,6 +119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", + "regex-automata", "serde", ] @@ -244,16 +245,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "ctor" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6" -dependencies = [ - "ctor-proc-macro", - "dtor 0.0.6", -] - [[package]] name = "ctor" version = "0.5.0" @@ -261,7 +252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb" dependencies = [ "ctor-proc-macro", - "dtor 0.1.0", + "dtor", ] [[package]] @@ -304,9 +295,9 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "2.1.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5597a4b7fe5275fc9dcf88ce26326bc8e4cb87d0130f33752d4c5f717793cf" +checksum = "853d5bcf0b73bd5e6d945b976288621825c7166e9f06c5a035ae1aaf42d1b64f" dependencies = [ "cfg-if", "libc", @@ -320,30 +311,15 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dtor" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8" -dependencies = [ - "dtor-proc-macro 0.0.5", -] - [[package]] name = "dtor" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934" dependencies = [ - "dtor-proc-macro 0.0.6", + "dtor-proc-macro", ] -[[package]] -name = "dtor-proc-macro" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" - [[package]] name = "dtor-proc-macro" version = "0.0.6" @@ -544,6 +520,47 @@ 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", + "jiff-tzdb-platform", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", + "windows-sys 0.59.0", +] + +[[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", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "js-sys" version = "0.3.77" @@ -723,6 +740,21 @@ dependencies = [ "siphasher", ] +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "powerfmt" version = "0.2.0" @@ -918,7 +950,7 @@ dependencies = [ "clap", "clap_complete", "clap_mangen", - "ctor 0.5.0", + "ctor", "fancy-regex", "libc", "memchr", @@ -1206,14 +1238,17 @@ dependencies = [ [[package]] name = "uucore" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9032bf981784f22fcc5ddc7e74b7cf3bae3d5f44a48d2054138ed38068b9f4e0" +checksum = "7203e48e80ac344450cba5323d8b4a71967ec1e81ae4022775ada90d2b0e08ac" dependencies = [ + "bstr", "clap", "dns-lookup", "fluent", "fluent-bundle", + "fluent-syntax", + "jiff", "libc", "nix", "number_prefix", @@ -1227,9 +1262,9 @@ dependencies = [ [[package]] name = "uucore_procs" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c933945fdac5b7779eae1fc746146e61f5b0298deb6ede002ce0b6e93e1b3bfc" +checksum = "449e64ce116ed0cc8c5897bd8706d36aed1ec027b647494df4eae6996d8d59de" dependencies = [ "proc-macro2", "quote", @@ -1238,18 +1273,17 @@ dependencies = [ [[package]] name = "uuhelp_parser" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beda381dd5c7927f8682f50b055b0903bb694ba5a4b27fad1b4934bc4fbf7b8d" +checksum = "9c9e4945611996e885dc4eeae23f3d6f20cfb6e8f4bad4985c2222bbcf9a9745" [[package]] name = "uutests" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12453ee52c9cffa6bf2c74f9f35ed0c824b846cb0b4bdee829d8150332e7204c" +checksum = "20482dada0c118dfe1eafe971195c170c4e9ab5a2409ead9b9b1833f7a54b1d2" dependencies = [ - "ctor 0.4.3", - "glob", + "ctor", "libc", "nix", "pretty_assertions", @@ -1257,7 +1291,6 @@ dependencies = [ "regex", "rlimit", "tempfile", - "time", "uucore", "xattr", ] diff --git a/Cargo.toml b/Cargo.toml index 0b8785b..c3c56d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ sysinfo = "0.37" tempfile = "3.10.1" textwrap = { version = "0.16.1", features = ["terminal_size"] } terminal_size = "0.4.2" -uucore = { version = "0.1.0", features = ["libc"] } +uucore = { version = "0.2.2", features = ["libc"] } xattr = "1.3.1" @@ -72,7 +72,7 @@ sysinfo = { workspace = true } terminal_size = { workspace = true } textwrap = { workspace = true } uucore = { workspace = true } -uutests = "0.1.0" +uutests = "0.2.2" [dev-dependencies] chrono = { workspace = true }