From 7ca3f0b338ee8a060cb40abf889f01900f4381a3 Mon Sep 17 00:00:00 2001 From: Niyaz Nigmatullin Date: Mon, 21 Nov 2022 09:02:15 +0200 Subject: [PATCH 1/2] deps: bump `textwrap` to 0.16 and `cargo +1.60.0 update` --- Cargo.lock | 532 ++++++++++++++++++++++------------------------------- Cargo.toml | 2 +- 2 files changed, 216 insertions(+), 318 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7f1445b3..7bf8b758a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,32 +100,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.60.1" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap 3.2.22", - "env_logger 0.9.1", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[package]] -name = "bindgen" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722" dependencies = [ "bitflags", "cexpr", @@ -157,20 +134,20 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "895adc16c8b3273fbbc32685a7d55227705eda08c01e77704020f3491924b44b" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.2.4", "digest", ] @@ -197,9 +174,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byte-unit" @@ -225,9 +202,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cexpr" @@ -267,21 +244,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "3.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -dependencies = [ - "atty", - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - [[package]] name = "clap" version = "4.0.26" @@ -290,7 +252,7 @@ checksum = "2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e" dependencies = [ "atty", "bitflags", - "clap_lex 0.3.0", + "clap_lex", "once_cell", "strsim", "termcolor", @@ -303,16 +265,7 @@ version = "4.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96b0fba905b035a30d25c1b585bf1171690712fbb0ad3ac47214963aa4acc36c" dependencies = [ - "clap 4.0.26", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "clap", ] [[package]] @@ -342,13 +295,13 @@ checksum = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" [[package]] name = "console" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", "terminal_size 0.1.17", "unicode-width", "winapi", @@ -360,6 +313,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + [[package]] name = "conv" version = "0.3.3" @@ -381,7 +340,7 @@ version = "0.0.16" dependencies = [ "atty", "chrono", - "clap 4.0.26", + "clap", "clap_complete", "conv", "filetime", @@ -614,22 +573,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "96bf8df95e795db1a4aca2957ad884a2df35413b24bbeb3114422f3cc21498e8" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "422f23e724af1240ec469ea1e834d87a4b59ce2efe2c6a96256b0c47e2fd86aa" dependencies = [ "cfg-if", ] @@ -677,9 +636,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", @@ -703,9 +662,9 @@ checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" [[package]] name = "cxx" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" dependencies = [ "cc", "cxxbridge-flags", @@ -715,9 +674,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" dependencies = [ "cc", "codespan-reporting", @@ -730,15 +689,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" [[package]] name = "cxxbridge-macro" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", @@ -834,19 +793,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "errno" version = "0.2.8" @@ -904,7 +850,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -940,11 +886,11 @@ dependencies = [ [[package]] name = "fts-sys" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd59adcdd5dfaedc140e7007586a13c397777fcec8cc33460b4bd70bf0df5fa5" +checksum = "32bd98333d10742c0b048272ebf4cb05336d415423b853961c92ccb398966a03" dependencies = [ - "bindgen 0.60.1", + "bindgen", "libc", ] @@ -969,9 +915,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -1040,17 +986,11 @@ dependencies = [ "winapi", ] -[[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.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1070,16 +1010,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - [[package]] name = "indicatif" version = "0.17.2" @@ -1123,9 +1053,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "itertools" @@ -1153,9 +1083,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kqueue" @@ -1197,9 +1130,9 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -1287,6 +1220,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1304,14 +1246,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -1324,7 +1266,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", "pin-utils", ] @@ -1470,9 +1412,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "ouroboros" @@ -1524,15 +1466,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -1593,9 +1535,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "platform-info" @@ -1615,9 +1557,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" @@ -1689,7 +1631,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "env_logger 0.8.4", + "env_logger", "log", "rand", ] @@ -1744,11 +1686,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -1756,9 +1697,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1800,9 +1741,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -1859,16 +1800,16 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.35.11" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -1914,11 +1855,11 @@ dependencies = [ [[package]] name = "selinux-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cedc32b124fddbfe092eb22894f206829ca9109ca402f4e9d696ac2430cbbe8" +checksum = "e4c02c5c6e2db8a78b3ffffc666f75fcda5bbd7068ba3c0f560e5504f4d88443" dependencies = [ - "bindgen 0.61.0", + "bindgen", "cc", "dunce", "walkdir", @@ -1926,9 +1867,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" [[package]] name = "sha1" @@ -2059,9 +2000,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -2117,14 +2058,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" dependencies = [ "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "textwrap" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "smawk", "terminal_size 0.2.2", @@ -2253,7 +2194,7 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" name = "uu_arch" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "platform-info", "uucore", ] @@ -2262,7 +2203,7 @@ dependencies = [ name = "uu_base32" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2278,7 +2219,7 @@ dependencies = [ name = "uu_basename" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2286,7 +2227,7 @@ dependencies = [ name = "uu_basenc" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uu_base32", "uucore", ] @@ -2296,7 +2237,7 @@ name = "uu_cat" version = "0.0.16" dependencies = [ "atty", - "clap 4.0.26", + "clap", "nix", "thiserror", "uucore", @@ -2306,7 +2247,7 @@ dependencies = [ name = "uu_chcon" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "fts-sys", "libc", "selinux", @@ -2318,7 +2259,7 @@ dependencies = [ name = "uu_chgrp" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2326,7 +2267,7 @@ dependencies = [ name = "uu_chmod" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2335,7 +2276,7 @@ dependencies = [ name = "uu_chown" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2343,7 +2284,7 @@ dependencies = [ name = "uu_chroot" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2351,7 +2292,7 @@ dependencies = [ name = "uu_cksum" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2359,7 +2300,7 @@ dependencies = [ name = "uu_comm" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2367,7 +2308,7 @@ dependencies = [ name = "uu_cp" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "exacl", "filetime", "indicatif", @@ -2383,7 +2324,7 @@ dependencies = [ name = "uu_csplit" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "regex", "thiserror", "uucore", @@ -2395,7 +2336,7 @@ version = "0.0.16" dependencies = [ "atty", "bstr", - "clap 4.0.26", + "clap", "memchr", "uucore", ] @@ -2405,10 +2346,10 @@ name = "uu_date" version = "0.0.16" dependencies = [ "chrono", - "clap 4.0.26", + "clap", "libc", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2416,7 +2357,7 @@ name = "uu_dd" version = "0.0.16" dependencies = [ "byte-unit", - "clap 4.0.26", + "clap", "gcd", "libc", "signal-hook", @@ -2427,7 +2368,7 @@ dependencies = [ name = "uu_df" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "unicode-width", "uucore", ] @@ -2436,7 +2377,7 @@ dependencies = [ name = "uu_dir" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uu_ls", "uucore", ] @@ -2445,7 +2386,7 @@ dependencies = [ name = "uu_dircolors" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2453,7 +2394,7 @@ dependencies = [ name = "uu_dirname" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2462,17 +2403,17 @@ name = "uu_du" version = "0.0.16" dependencies = [ "chrono", - "clap 4.0.26", + "clap", "glob", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_echo" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2480,7 +2421,7 @@ dependencies = [ name = "uu_env" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "nix", "rust-ini", "uucore", @@ -2490,7 +2431,7 @@ dependencies = [ name = "uu_expand" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "unicode-width", "uucore", ] @@ -2499,7 +2440,7 @@ dependencies = [ name = "uu_expr" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "num-bigint", "num-traits", "onig", @@ -2510,7 +2451,7 @@ dependencies = [ name = "uu_factor" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "coz", "num-traits", "paste", @@ -2524,7 +2465,7 @@ dependencies = [ name = "uu_false" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2532,7 +2473,7 @@ dependencies = [ name = "uu_fmt" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "unicode-width", "uucore", ] @@ -2541,7 +2482,7 @@ dependencies = [ name = "uu_fold" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2549,7 +2490,7 @@ dependencies = [ name = "uu_groups" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2559,7 +2500,7 @@ version = "0.0.16" dependencies = [ "blake2b_simd", "blake3", - "clap 4.0.26", + "clap", "digest", "hex", "md-5", @@ -2575,7 +2516,7 @@ dependencies = [ name = "uu_head" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "memchr", "uucore", ] @@ -2584,7 +2525,7 @@ dependencies = [ name = "uu_hostid" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2593,17 +2534,17 @@ dependencies = [ name = "uu_hostname" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "hostname", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_id" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "selinux", "uucore", ] @@ -2612,7 +2553,7 @@ dependencies = [ name = "uu_install" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "file_diff", "filetime", "libc", @@ -2624,7 +2565,7 @@ dependencies = [ name = "uu_join" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "memchr", "uucore", ] @@ -2633,7 +2574,7 @@ dependencies = [ name = "uu_kill" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "nix", "uucore", ] @@ -2642,7 +2583,7 @@ dependencies = [ name = "uu_link" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2650,7 +2591,7 @@ dependencies = [ name = "uu_ln" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2658,7 +2599,7 @@ dependencies = [ name = "uu_logname" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2669,7 +2610,7 @@ version = "0.0.16" dependencies = [ "atty", "chrono", - "clap 4.0.26", + "clap", "glob", "lscolors", "number_prefix", @@ -2685,7 +2626,7 @@ dependencies = [ name = "uu_mkdir" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2693,7 +2634,7 @@ dependencies = [ name = "uu_mkfifo" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2702,7 +2643,7 @@ dependencies = [ name = "uu_mknod" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2711,7 +2652,7 @@ dependencies = [ name = "uu_mktemp" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "rand", "tempfile", "uucore", @@ -2722,7 +2663,7 @@ name = "uu_more" version = "0.0.16" dependencies = [ "atty", - "clap 4.0.26", + "clap", "crossterm", "nix", "unicode-segmentation", @@ -2734,7 +2675,7 @@ dependencies = [ name = "uu_mv" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "fs_extra", "uucore", ] @@ -2743,7 +2684,7 @@ dependencies = [ name = "uu_nice" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "nix", "uucore", @@ -2753,7 +2694,7 @@ dependencies = [ name = "uu_nl" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "regex", "uucore", ] @@ -2763,7 +2704,7 @@ name = "uu_nohup" version = "0.0.16" dependencies = [ "atty", - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2772,7 +2713,7 @@ dependencies = [ name = "uu_nproc" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "num_cpus", "uucore", @@ -2782,7 +2723,7 @@ dependencies = [ name = "uu_numfmt" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2791,7 +2732,7 @@ name = "uu_od" version = "0.0.16" dependencies = [ "byteorder", - "clap 4.0.26", + "clap", "half", "uucore", ] @@ -2800,7 +2741,7 @@ dependencies = [ name = "uu_paste" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2808,7 +2749,7 @@ dependencies = [ name = "uu_pathchk" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2817,7 +2758,7 @@ dependencies = [ name = "uu_pinky" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2825,7 +2766,7 @@ dependencies = [ name = "uu_pr" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "itertools", "quick-error", "regex", @@ -2837,7 +2778,7 @@ dependencies = [ name = "uu_printenv" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2845,7 +2786,7 @@ dependencies = [ name = "uu_printf" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2853,7 +2794,7 @@ dependencies = [ name = "uu_ptx" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "regex", "uucore", ] @@ -2862,7 +2803,7 @@ dependencies = [ name = "uu_pwd" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2870,7 +2811,7 @@ dependencies = [ name = "uu_readlink" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2878,7 +2819,7 @@ dependencies = [ name = "uu_realpath" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2886,7 +2827,7 @@ dependencies = [ name = "uu_relpath" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2894,19 +2835,19 @@ dependencies = [ name = "uu_rm" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "remove_dir_all 0.7.0", "uucore", "walkdir", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_rmdir" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", ] @@ -2915,7 +2856,7 @@ dependencies = [ name = "uu_runcon" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "selinux", "thiserror", @@ -2927,7 +2868,7 @@ name = "uu_seq" version = "0.0.16" dependencies = [ "bigdecimal", - "clap 4.0.26", + "clap", "num-bigint", "num-traits", "uucore", @@ -2937,7 +2878,7 @@ dependencies = [ name = "uu_shred" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "rand", "uucore", ] @@ -2946,7 +2887,7 @@ dependencies = [ name = "uu_shuf" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "memchr", "rand", "rand_core", @@ -2957,7 +2898,7 @@ dependencies = [ name = "uu_sleep" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -2966,7 +2907,7 @@ name = "uu_sort" version = "0.0.16" dependencies = [ "binary-heap-plus", - "clap 4.0.26", + "clap", "compare", "ctrlc", "fnv", @@ -2984,7 +2925,7 @@ dependencies = [ name = "uu_split" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "memchr", "uucore", ] @@ -2993,7 +2934,7 @@ dependencies = [ name = "uu_stat" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3001,7 +2942,7 @@ dependencies = [ name = "uu_stdbuf" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "tempfile", "uu_stdbuf_libstdbuf", "uucore", @@ -3021,7 +2962,7 @@ dependencies = [ name = "uu_stty" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "nix", "uucore", ] @@ -3030,7 +2971,7 @@ dependencies = [ name = "uu_sum" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3038,18 +2979,18 @@ dependencies = [ name = "uu_sync" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "nix", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_tac" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "memchr", "memmap2", "regex", @@ -3060,7 +3001,7 @@ dependencies = [ name = "uu_tail" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "memchr", "nix", @@ -3068,14 +3009,14 @@ dependencies = [ "same-file", "uucore", "winapi-util", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_tee" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "retain_mut", "uucore", @@ -3085,7 +3026,7 @@ dependencies = [ name = "uu_test" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "redox_syscall", "uucore", @@ -3095,7 +3036,7 @@ dependencies = [ name = "uu_timeout" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "nix", "uucore", @@ -3105,18 +3046,18 @@ dependencies = [ name = "uu_touch" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "filetime", "time", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_tr" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "nom", "uucore", ] @@ -3125,7 +3066,7 @@ dependencies = [ name = "uu_true" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3133,7 +3074,7 @@ dependencies = [ name = "uu_truncate" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3141,7 +3082,7 @@ dependencies = [ name = "uu_tsort" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3150,7 +3091,7 @@ name = "uu_tty" version = "0.0.16" dependencies = [ "atty", - "clap 4.0.26", + "clap", "nix", "uucore", ] @@ -3159,7 +3100,7 @@ dependencies = [ name = "uu_uname" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "platform-info", "uucore", ] @@ -3168,7 +3109,7 @@ dependencies = [ name = "uu_unexpand" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "unicode-width", "uucore", ] @@ -3177,7 +3118,7 @@ dependencies = [ name = "uu_uniq" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "strum", "strum_macros", "uucore", @@ -3187,7 +3128,7 @@ dependencies = [ name = "uu_unlink" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3196,7 +3137,7 @@ name = "uu_uptime" version = "0.0.16" dependencies = [ "chrono", - "clap 4.0.26", + "clap", "uucore", ] @@ -3204,7 +3145,7 @@ dependencies = [ name = "uu_users" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3212,7 +3153,7 @@ dependencies = [ name = "uu_vdir" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uu_ls", "uucore", ] @@ -3222,7 +3163,7 @@ name = "uu_wc" version = "0.0.16" dependencies = [ "bytecount", - "clap 4.0.26", + "clap", "libc", "nix", "unicode-width", @@ -3234,7 +3175,7 @@ dependencies = [ name = "uu_who" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "uucore", ] @@ -3242,17 +3183,17 @@ dependencies = [ name = "uu_whoami" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "uucore", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "uu_yes" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "libc", "nix", "uucore", @@ -3262,7 +3203,7 @@ dependencies = [ name = "uucore" version = "0.0.16" dependencies = [ - "clap 4.0.26", + "clap", "data-encoding", "data-encoding-macro", "dns-lookup", @@ -3279,7 +3220,7 @@ dependencies = [ "walkdir", "wild", "winapi-util", - "windows-sys 0.42.0", + "windows-sys", "z85", ] @@ -3293,9 +3234,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" [[package]] name = "version_check" @@ -3425,19 +3366,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -3445,12 +3373,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", ] [[package]] @@ -3459,48 +3387,24 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.0" @@ -3513,12 +3417,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index 251d508fd..4ad55d4de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -266,7 +266,7 @@ clap_complete = "4.0" once_cell = "1.13.1" phf = "0.11.1" selinux = { version="0.3", optional = true } -textwrap = { version="0.15", features=["terminal_size"] } +textwrap = { version="0.16.0", features=["terminal_size"] } uucore = { version=">=0.0.16", package="uucore", path="src/uucore" } zip = { version = "0.6.3", optional=true, default_features=false, features=["deflate"] } # * uutils From fd4295398455999f859f05cd098146f9145b2346 Mon Sep 17 00:00:00 2001 From: Niyaz Nigmatullin Date: Mon, 21 Nov 2022 09:02:46 +0200 Subject: [PATCH 2/2] deny: modify duplicate packages --- deny.toml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/deny.toml b/deny.toml index 2db22ec19..a2578384d 100644 --- a/deny.toml +++ b/deny.toml @@ -65,22 +65,12 @@ skip = [ { name = "env_logger", version = "=0.8.4" }, # tempfile { name = "remove_dir_all", version = "=0.5.3" }, - # bindgen (via selinux-sys & fts-sys) - { name = "clap", version = "=3.2.22" }, - # bindgen (via selinux-sys & fts-sys) - { name = "clap_lex", version = "=0.2.4" }, - # fts-sys. See: - # https://github.com/uutils/coreutils/pull/4168#issuecomment-1321164839 - { name = "bindgen", version = "=0.60.1" }, - # windows-sys (via terminal_size, crossterm -> parking_lot, notify -> filetime) - { name = "windows-sys", version = "=0.36.1" }, - { name = "windows_aarch64_msvc", version = "=0.36.1" }, - { name = "windows_i686_gnu", version = "=0.36.1" }, - { name = "windows_i686_msvc", version = "=0.36.1" }, - { name = "windows_x86_64_gnu", version = "=0.36.1" }, - { name = "windows_x86_64_msvc", version = "=0.36.1" }, # console (via indicatif) { name = "terminal_size", version = "=0.1.17" }, + # nix + { name = "memoffset", version = "=0.6.5"}, + # blake2b_simd + { name = "constant_time_eq", version = "=0.1.5"}, ] # spell-checker: enable