diff --git a/.deny.toml b/.deny.toml index 8b9bc4faf..6239fe0fb 100644 --- a/.deny.toml +++ b/.deny.toml @@ -11,8 +11,7 @@ unmaintained = "warn" yanked = "warn" notice = "warn" ignore = [ - # xml-rs via apple-bundles: not used for untrusted input - "RUSTSEC-2022-0048", + ] [licenses] diff --git a/Cargo.lock b/Cargo.lock index 9569a1452..2dbb1ceb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -147,7 +147,7 @@ dependencies = [ "wiremock", "workspace-hack", "zip", - "zstd 0.12.1+zstd.1.5.2", + "zstd 0.12.2+zstd.1.5.2", ] [[package]] @@ -181,15 +181,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "apple-bundles" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0238f9d073644a0a9f37447376330bfc62a0e11686adbee14afbb4bcef186bc7" +checksum = "716b8a7bacf7325eb3e7a1a7f5ead4da91e1e16d9b56a25edea0e1e4ba21fd8e" dependencies = [ "anyhow", "plist", @@ -210,7 +210,7 @@ dependencies = [ "workspace-hack", "xz2", "zip", - "zstd 0.12.1+zstd.1.5.2", + "zstd 0.12.2+zstd.1.5.2", ] [[package]] @@ -287,9 +287,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" dependencies = [ "proc-macro2", "quote", @@ -315,9 +315,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" +checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" dependencies = [ "async-trait", "axum-core", @@ -361,9 +361,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" +checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" dependencies = [ "async-trait", "bytes", @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621" +checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1" dependencies = [ "heck", "proc-macro2", @@ -390,15 +390,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.5.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -472,10 +472,20 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.11.1" +name = "bstr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -512,9 +522,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" [[package]] name = "cast" @@ -533,9 +543,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -618,13 +628,13 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" dependencies = [ "bitflags", "clap_derive", - "clap_lex 0.3.0", + "clap_lex 0.3.1", "is-terminal", "once_cell", "strsim", @@ -633,9 +643,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -655,9 +665,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -697,9 +707,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -894,7 +904,7 @@ name = "csv" version = "1.1.6" source = "git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90#1c9d3aab6f79a7d815c69f925a46a4590c115f90" dependencies = [ - "bstr", + "bstr 0.2.17", "csv-core", "itoa 1.0.5", "ryu", @@ -911,9 +921,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -923,9 +933,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", @@ -938,15 +948,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", @@ -1146,7 +1156,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1173,7 +1183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -1451,24 +1461,24 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr", + "bstr 1.1.0", "fnv", "log", "regex", @@ -1787,9 +1797,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" +checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780" [[package]] name = "infer" @@ -1843,30 +1853,30 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "ipnet" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1964,9 +1974,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -2018,9 +2028,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -2065,7 +2075,7 @@ dependencies = [ "anyhow", "apple-bundles", "camino", - "clap 4.0.29", + "clap 4.1.1", "glob", "lazy_static", "plist", @@ -2082,7 +2092,7 @@ version = "0.0.0" dependencies = [ "anyhow", "camino", - "clap 4.0.29", + "clap 4.1.1", "glob", "tugger-windows-codesign", "walkdir", @@ -2152,18 +2162,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -2190,15 +2200,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2217,7 +2218,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2291,9 +2292,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -2377,9 +2378,9 @@ dependencies = [ [[package]] name = "object" -version = "0.29.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" dependencies = [ "memchr", ] @@ -2454,7 +2455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2504,15 +2505,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2540,9 +2541,9 @@ dependencies = [ [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -2737,16 +2738,16 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" +checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" dependencies = [ "base64 0.13.1", "indexmap", "line-wrap", + "quick-xml", "serde", "time", - "xml-rs", ] [[package]] @@ -2791,9 +2792,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -2836,24 +2837,24 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -2861,9 +2862,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -2883,9 +2884,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -2896,9 +2897,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -2930,14 +2931,14 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "ccd4149c8c3975099622b4e1962dac27565cf5663b76452c3e2b66e0b6824277" dependencies = [ "cfg-if", "indoc", "libc", - "memoffset 0.6.5", + "memoffset 0.8.0", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -2947,9 +2948,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +checksum = "9cd09fe469834db21ee60e0051030339e5d361293d8cb5ec02facf7fdcf52dbf" dependencies = [ "once_cell", "target-lexicon", @@ -2957,9 +2958,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "0c427c9a96b9c5b12156dbc11f76b14f49e9aae8905ca783ea87c249044ef137" dependencies = [ "libc", "pyo3-build-config", @@ -2967,9 +2968,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "16b822bbba9d60630a44d2109bc410489bb2f439b33e3a14ddeb8a40b378a7c4" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2979,15 +2980,24 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "84ae898104f7c99db06231160770f3e40dad6eb9021daddc0fedfa3e41dff10a" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.23" @@ -3080,11 +3090,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] @@ -3112,9 +3121,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", @@ -3133,9 +3142,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -3247,7 +3256,7 @@ name = "runner" version = "0.0.0" dependencies = [ "camino", - "clap 4.0.29", + "clap 4.1.1", "junction", "termcolor", "workspace-hack", @@ -3290,16 +3299,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3364,12 +3373,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -3380,9 +3388,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -3445,9 +3453,9 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" @@ -3513,9 +3521,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", @@ -3644,9 +3652,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snafu" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ba99b054b22972ee794cf04e5ef572da1229e33b65f3c57abbff0525a454" +checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" dependencies = [ "backtrace", "doc-comment", @@ -3655,9 +3663,9 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e79cdebbabaebb06a9bdbaedc7f159b410461f63611d4d0e3fb0fab8fed850" +checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck", "proc-macro2", @@ -3820,9 +3828,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -3931,9 +3939,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg", "bytes", @@ -3946,7 +3954,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -4009,9 +4017,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -4140,15 +4148,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tugger-common" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825d3a3de05922acfe17d28a8dd934288a73c725a6090412235947ddc5025fa2" +checksum = "f90d950380afdb1a6bbe74f29485a04e821869dfad11f5929ff1c5b1dac09d02" dependencies = [ "anyhow", "fs2", @@ -4165,9 +4173,9 @@ dependencies = [ [[package]] name = "tugger-windows" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6f0ea27028aded9a0c6bf5b53ff0bf628c58bf383b60bd19a86429d0538cfa" +checksum = "e9f181ac4fc7f8facfd418824d13045cd068ee73de44319a6116868c22789782" dependencies = [ "anyhow", "duct", @@ -4181,9 +4189,9 @@ dependencies = [ [[package]] name = "tugger-windows-codesign" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea62dcbcbab8703910e0dd586c09175bae7560d2bf9691b543cb734e4f37ac7" +checksum = "ed3f09f8bdace495373cec3fc607bc39f00720a984ba82e310cc9382462fd364" dependencies = [ "anyhow", "duct", @@ -4340,9 +4348,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "untrusted" @@ -4572,19 +4580,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" @@ -4592,85 +4587,55 @@ 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]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.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" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.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" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.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" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -4717,7 +4682,6 @@ dependencies = [ name = "workspace-hack" version = "0.1.0" dependencies = [ - "bstr", "bytes", "cc", "crossbeam-utils", @@ -4732,6 +4696,7 @@ dependencies = [ "hmac", "hyper", "indexmap", + "itertools", "log", "num-traits", "phf_shared 0.11.1", @@ -4740,7 +4705,6 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "regex", - "regex-automata", "regex-syntax", "reqwest", "scopeguard", @@ -4758,7 +4722,7 @@ dependencies = [ "url", "zip", "zstd 0.11.2+zstd.1.5.2", - "zstd 0.12.1+zstd.1.5.2", + "zstd 0.12.2+zstd.1.5.2", "zstd-safe 5.0.2+zstd.1.5.2", "zstd-safe 6.0.2+zstd.1.5.2", "zstd-sys", @@ -4773,12 +4737,6 @@ dependencies = [ "libc", ] -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - [[package]] name = "xz2" version = "0.1.7" @@ -4790,9 +4748,9 @@ dependencies = [ [[package]] name = "yasna" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ "time", ] @@ -4828,9 +4786,9 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.1+zstd.1.5.2" +version = "0.12.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c947d2adc84ff9a59f2e3c03b81aa4128acf28d6ad7d56273f7e8af14e47bea" +checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" dependencies = [ "zstd-safe 6.0.2+zstd.1.5.2", ] @@ -4857,10 +4815,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/build/archives/Cargo.toml b/build/archives/Cargo.toml index 20f3069cc..42254d37e 100644 --- a/build/archives/Cargo.toml +++ b/build/archives/Cargo.toml @@ -9,15 +9,15 @@ license.workspace = true rust-version.workspace = true [dependencies] -camino = "1.1.1" +camino = "1.1.2" flate2 = "1.0.25" sha2 = { version = "0.10.6" } tar = "0.4.38" -tokio = { version = "1.23.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } xz2 = "0.1.7" zip = "0.6.3" -zstd = "0.12.0" +zstd = "0.12.2" [features] rustls = ["reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"] diff --git a/build/ninja_gen/Cargo.toml b/build/ninja_gen/Cargo.toml index 262acbb44..8336e685b 100644 --- a/build/ninja_gen/Cargo.toml +++ b/build/ninja_gen/Cargo.toml @@ -9,12 +9,12 @@ license.workspace = true rust-version.workspace = true [dependencies] -camino = "1.1.1" -globset = "0.4.9" +camino = "1.1.2" +globset = "0.4.10" itertools = "0.10.5" lazy_static = "1.4.0" maplit = "1.0.2" -num_cpus = "1.14.0" +num_cpus = "1.15.0" walkdir = "2.3.2" which = "4.3.0" workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } diff --git a/build/runner/Cargo.toml b/build/runner/Cargo.toml index 0b779f265..124ff2956 100644 --- a/build/runner/Cargo.toml +++ b/build/runner/Cargo.toml @@ -9,8 +9,8 @@ license.workspace = true rust-version.workspace = true [dependencies] -camino = "1.1.1" -clap = { version = "4.0.29", features = ["derive"] } +camino = "1.1.2" +clap = { version = "4.1.1", features = ["derive"] } junction = "0.2.0" -termcolor = "1.1.3" +termcolor = "1.2.0" workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } diff --git a/cargo/licenses.json b/cargo/licenses.json index d05f5c6da..774bf4610 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -1,7 +1,7 @@ [ { "name": "addr2line", - "version": "0.17.0", + "version": "0.19.0", "authors": null, "repository": "https://github.com/gimli-rs/addr2line", "license": "Apache-2.0 OR MIT", @@ -82,7 +82,7 @@ }, { "name": "anyhow", - "version": "1.0.66", + "version": "1.0.68", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/anyhow", "license": "Apache-2.0 OR MIT", @@ -163,7 +163,7 @@ }, { "name": "async-trait", - "version": "0.1.60", + "version": "0.1.61", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/async-trait", "license": "Apache-2.0 OR MIT", @@ -181,7 +181,7 @@ }, { "name": "axum", - "version": "0.6.1", + "version": "0.6.2", "authors": null, "repository": "https://github.com/tokio-rs/axum", "license": "MIT", @@ -199,7 +199,7 @@ }, { "name": "axum-core", - "version": "0.3.0", + "version": "0.3.1", "authors": null, "repository": "https://github.com/tokio-rs/axum", "license": "MIT", @@ -208,7 +208,7 @@ }, { "name": "axum-macros", - "version": "0.3.0", + "version": "0.3.1", "authors": null, "repository": "https://github.com/tokio-rs/axum", "license": "MIT", @@ -217,7 +217,7 @@ }, { "name": "backtrace", - "version": "0.3.66", + "version": "0.3.67", "authors": "The Rust Project Developers", "repository": "https://github.com/rust-lang/backtrace-rs", "license": "Apache-2.0 OR MIT", @@ -289,7 +289,7 @@ }, { "name": "bumpalo", - "version": "3.11.1", + "version": "3.12.0", "authors": "Nick Fitzgerald ", "repository": "https://github.com/fitzgen/bumpalo", "license": "Apache-2.0 OR MIT", @@ -316,7 +316,7 @@ }, { "name": "bzip2", - "version": "0.4.3", + "version": "0.4.4", "authors": "Alex Crichton ", "repository": "https://github.com/alexcrichton/bzip2-rs", "license": "Apache-2.0 OR MIT", @@ -334,7 +334,7 @@ }, { "name": "cc", - "version": "1.0.77", + "version": "1.0.78", "authors": "Alex Crichton ", "repository": "https://github.com/rust-lang/cc-rs", "license": "Apache-2.0 OR MIT", @@ -388,7 +388,7 @@ }, { "name": "concurrent-queue", - "version": "2.0.0", + "version": "2.1.0", "authors": "Stjepan Glavina |Taiki Endo |John Nunley ", "repository": "https://github.com/smol-rs/concurrent-queue", "license": "Apache-2.0 OR MIT", @@ -505,7 +505,7 @@ }, { "name": "cxx", - "version": "1.0.83", + "version": "1.0.86", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/cxx", "license": "Apache-2.0 OR MIT", @@ -514,7 +514,7 @@ }, { "name": "cxx-build", - "version": "1.0.83", + "version": "1.0.86", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/cxx", "license": "Apache-2.0 OR MIT", @@ -523,7 +523,7 @@ }, { "name": "cxxbridge-flags", - "version": "1.0.83", + "version": "1.0.86", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/cxx", "license": "Apache-2.0 OR MIT", @@ -532,7 +532,7 @@ }, { "name": "cxxbridge-macro", - "version": "1.0.83", + "version": "1.0.86", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/cxx", "license": "Apache-2.0 OR MIT", @@ -557,6 +557,15 @@ "license_file": null, "description": "Dead simple async pool utitities for sync managers" }, + { + "name": "difflib", + "version": "0.4.0", + "authors": "Dima Kudosh ", + "repository": "https://github.com/DimaKudosh/difflib", + "license": "MIT", + "license_file": null, + "description": "Port of Python's difflib library to Rust." + }, { "name": "digest", "version": "0.10.6", @@ -575,15 +584,6 @@ "license_file": null, "description": "A derive macro for implementing the display Trait via a doc comment and string interpolation" }, - { - "name": "dissimilar", - "version": "1.0.4", - "authors": "David Tolnay ", - "repository": "https://github.com/dtolnay/dissimilar", - "license": "Apache-2.0", - "license_file": null, - "description": "Diff library with semantic cleanup, based on Google's diff-match-patch" - }, { "name": "doc-comment", "version": "0.3.3", @@ -919,7 +919,7 @@ }, { "name": "gimli", - "version": "0.26.2", + "version": "0.27.0", "authors": null, "repository": "https://github.com/gimli-rs/gimli", "license": "Apache-2.0 OR MIT", @@ -1207,7 +1207,7 @@ }, { "name": "io-lifetimes", - "version": "1.0.3", + "version": "1.0.4", "authors": "Dan Gohman ", "repository": "https://github.com/sunfishcode/io-lifetimes", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -1216,7 +1216,7 @@ }, { "name": "ipnet", - "version": "2.6.0", + "version": "2.7.1", "authors": "Kris Price ", "repository": "https://github.com/krisprice/ipnet", "license": "Apache-2.0 OR MIT", @@ -1225,7 +1225,7 @@ }, { "name": "is-terminal", - "version": "0.4.1", + "version": "0.4.2", "authors": "softprops |Dan Gohman ", "repository": "https://github.com/sunfishcode/is-terminal", "license": "MIT", @@ -1297,7 +1297,7 @@ }, { "name": "link-cplusplus", - "version": "1.0.7", + "version": "1.0.8", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/link-cplusplus", "license": "Apache-2.0 OR MIT", @@ -1306,7 +1306,7 @@ }, { "name": "linux-raw-sys", - "version": "0.1.3", + "version": "0.1.4", "authors": "Dan Gohman ", "repository": "https://github.com/sunfishcode/linux-raw-sys", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -1421,15 +1421,6 @@ "license_file": null, "description": "Fast float parsing conversion routines." }, - { - "name": "miniz_oxide", - "version": "0.5.4", - "authors": "Frommi |oyvindln ", - "repository": "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide", - "license": "Apache-2.0 OR MIT OR Zlib", - "license_file": null, - "description": "DEFLATE compression and decompression library rewritten in Rust based on miniz" - }, { "name": "miniz_oxide", "version": "0.6.2", @@ -1486,7 +1477,7 @@ }, { "name": "nom", - "version": "7.1.1", + "version": "7.1.3", "authors": "contact@geoffroycouprie.com", "repository": "https://github.com/Geal/nom", "license": "MIT", @@ -1567,7 +1558,7 @@ }, { "name": "object", - "version": "0.29.0", + "version": "0.30.2", "authors": null, "repository": "https://github.com/gimli-rs/object", "license": "Apache-2.0 OR MIT", @@ -1657,7 +1648,7 @@ }, { "name": "parking_lot_core", - "version": "0.9.5", + "version": "0.9.6", "authors": "Amanieu d'Antras ", "repository": "https://github.com/Amanieu/parking_lot", "license": "Apache-2.0 OR MIT", @@ -1837,7 +1828,7 @@ }, { "name": "prettyplease", - "version": "0.1.21", + "version": "0.1.23", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/prettyplease", "license": "Apache-2.0 OR MIT", @@ -1855,7 +1846,7 @@ }, { "name": "proc-macro-hack", - "version": "0.5.19", + "version": "0.5.20+deprecated", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/proc-macro-hack", "license": "Apache-2.0 OR MIT", @@ -1864,7 +1855,7 @@ }, { "name": "proc-macro2", - "version": "1.0.49", + "version": "1.0.50", "authors": "David Tolnay |Alex Crichton ", "repository": "https://github.com/dtolnay/proc-macro2", "license": "Apache-2.0 OR MIT", @@ -1873,7 +1864,7 @@ }, { "name": "prost", - "version": "0.11.3", + "version": "0.11.6", "authors": "Dan Burkert |Lucio Franco ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -1882,7 +1873,7 @@ }, { "name": "prost-build", - "version": "0.11.4", + "version": "0.11.6", "authors": "Dan Burkert |Lucio Franco |Tokio Contributors ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -1891,7 +1882,7 @@ }, { "name": "prost-derive", - "version": "0.11.2", + "version": "0.11.6", "authors": "Dan Burkert |Lucio Franco |Tokio Contributors ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -1900,7 +1891,7 @@ }, { "name": "prost-types", - "version": "0.11.2", + "version": "0.11.6", "authors": "Dan Burkert |Lucio Franco ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -2008,7 +1999,7 @@ }, { "name": "regex", - "version": "1.7.0", + "version": "1.7.1", "authors": "The Rust Project Developers", "repository": "https://github.com/rust-lang/regex", "license": "Apache-2.0 OR MIT", @@ -2098,7 +2089,7 @@ }, { "name": "rustix", - "version": "0.36.5", + "version": "0.36.6", "authors": "Dan Gohman |Jakub Konka ", "repository": "https://github.com/bytecodealliance/rustix", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -2152,7 +2143,7 @@ }, { "name": "schannel", - "version": "0.1.20", + "version": "0.1.21", "authors": "Steven Fackler |Steffen Butzer ", "repository": "https://github.com/steffengy/schannel-rs", "license": "MIT", @@ -2170,7 +2161,7 @@ }, { "name": "scratch", - "version": "1.0.2", + "version": "1.0.3", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/scratch", "license": "Apache-2.0 OR MIT", @@ -2269,7 +2260,7 @@ }, { "name": "serde_repr", - "version": "0.1.9", + "version": "0.1.10", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/serde-repr", "license": "Apache-2.0 OR MIT", @@ -2368,7 +2359,7 @@ }, { "name": "snafu", - "version": "0.7.3", + "version": "0.7.4", "authors": "Jake Goulding ", "repository": "https://github.com/shepmaster/snafu", "license": "Apache-2.0 OR MIT", @@ -2377,7 +2368,7 @@ }, { "name": "snafu-derive", - "version": "0.7.3", + "version": "0.7.4", "authors": "Jake Goulding ", "repository": "https://github.com/shepmaster/snafu", "license": "Apache-2.0 OR MIT", @@ -2503,7 +2494,7 @@ }, { "name": "termcolor", - "version": "1.1.3", + "version": "1.2.0", "authors": "Andrew Gallant ", "repository": "https://github.com/BurntSushi/termcolor", "license": "MIT OR Unlicense", @@ -2593,7 +2584,7 @@ }, { "name": "tokio", - "version": "1.24.1", + "version": "1.24.2", "authors": "Tokio Contributors ", "repository": "https://github.com/tokio-rs/tokio", "license": "MIT", @@ -2647,9 +2638,9 @@ }, { "name": "toml", - "version": "0.5.9", + "version": "0.5.10", "authors": "Alex Crichton ", - "repository": "https://github.com/alexcrichton/toml-rs", + "repository": "https://github.com/toml-rs/toml", "license": "Apache-2.0 OR MIT", "license_file": null, "description": "A native Rust encoder and decoder of TOML-formatted files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures." @@ -2746,7 +2737,7 @@ }, { "name": "try-lock", - "version": "0.2.3", + "version": "0.2.4", "authors": "Sean McArthur ", "repository": "https://github.com/seanmonstar/try-lock", "license": "MIT", @@ -3131,15 +3122,6 @@ "license_file": null, "description": "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead." }, - { - "name": "windows-sys", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Rust for Windows" - }, { "name": "windows-sys", "version": "0.42.0", @@ -3151,7 +3133,7 @@ }, { "name": "windows_aarch64_gnullvm", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3160,16 +3142,7 @@ }, { "name": "windows_aarch64_msvc", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Code gen support for the windows crate" - }, - { - "name": "windows_aarch64_msvc", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3178,16 +3151,7 @@ }, { "name": "windows_i686_gnu", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Code gen support for the windows crate" - }, - { - "name": "windows_i686_gnu", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3196,16 +3160,7 @@ }, { "name": "windows_i686_msvc", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Code gen support for the windows crate" - }, - { - "name": "windows_i686_msvc", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3214,16 +3169,7 @@ }, { "name": "windows_x86_64_gnu", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Code gen support for the windows crate" - }, - { - "name": "windows_x86_64_gnu", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3232,7 +3178,7 @@ }, { "name": "windows_x86_64_gnullvm", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3241,16 +3187,7 @@ }, { "name": "windows_x86_64_msvc", - "version": "0.36.1", - "authors": "Microsoft", - "repository": "https://github.com/microsoft/windows-rs", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Code gen support for the windows crate" - }, - { - "name": "windows_x86_64_msvc", - "version": "0.42.0", + "version": "0.42.1", "authors": "Microsoft", "repository": "https://github.com/microsoft/windows-rs", "license": "Apache-2.0 OR MIT", @@ -3304,7 +3241,7 @@ }, { "name": "zstd", - "version": "0.12.1+zstd.1.5.2", + "version": "0.12.2+zstd.1.5.2", "authors": "Alexandre Bury ", "repository": "https://github.com/gyscos/zstd-rs", "license": "MIT", @@ -3331,7 +3268,7 @@ }, { "name": "zstd-sys", - "version": "2.0.4+zstd.1.5.2", + "version": "2.0.5+zstd.1.5.2", "authors": "Alexandre Bury ", "repository": "https://github.com/gyscos/zstd-rs", "license": "Apache-2.0 OR MIT", diff --git a/ftl/Cargo.toml b/ftl/Cargo.toml index 0b8a683a1..688f0f926 100644 --- a/ftl/Cargo.toml +++ b/ftl/Cargo.toml @@ -13,6 +13,6 @@ name = "ftl-sync" path = "sync.rs" [dependencies] -camino = "1.1.1" -snafu = { version = "0.7.3" } +camino = "1.1.2" +snafu = { version = "0.7.4" } workspace-hack = { version = "0.1", path = "../tools/workspace-hack" } diff --git a/pylib/rsbridge/Cargo.toml b/pylib/rsbridge/Cargo.toml index 195fe0983..26493e68f 100644 --- a/pylib/rsbridge/Cargo.toml +++ b/pylib/rsbridge/Cargo.toml @@ -15,7 +15,7 @@ workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } # /cargo/update.py needs to be run if updating the version below [dependencies.pyo3] -version = "0.17.3" +version = "0.18.0" features = ["extension-module", "abi3", "abi3-py39"] [lib] diff --git a/qt/bundle/mac/Cargo.toml b/qt/bundle/mac/Cargo.toml index 8d483c3d4..01b61ec01 100644 --- a/qt/bundle/mac/Cargo.toml +++ b/qt/bundle/mac/Cargo.toml @@ -9,15 +9,15 @@ license.workspace = true rust-version.workspace = true [dependencies] -anyhow = "1.0.66" -apple-bundles = "0.15.0" -camino = "1.1.1" -clap = { version = "4.0.29", features = ["derive"] } -glob = "0.3.0" +anyhow = "1.0.68" +apple-bundles = "0.17.0" +camino = "1.1.2" +clap = { version = "4.1.1", features = ["derive"] } +glob = "0.3.1" lazy_static = "1.4.0" -plist = "1.3.1" -serde = { version = "1.0.148", features = ["derive"] } -serde_json = "1.0.89" +plist = "1.4.0" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.91" simple-file-manifest = "0.11.0" walkdir = "2.3.2" workspace-hack = { version = "0.1", path = "../../../tools/workspace-hack" } diff --git a/qt/bundle/mac/src/notarize.rs b/qt/bundle/mac/src/notarize.rs index da89e1dbf..6a241c349 100644 --- a/qt/bundle/mac/src/notarize.rs +++ b/qt/bundle/mac/src/notarize.rs @@ -63,7 +63,7 @@ pub fn notarize_app(output_folder: &Utf8Path) -> Result<()> { ), }; let uuid_path = output_folder.with_extension("uuid"); - fs::write(&uuid_path, output.id).expect("write uuid"); + fs::write(uuid_path, output.id).expect("write uuid"); Ok(()) } diff --git a/qt/bundle/win/Cargo.toml b/qt/bundle/win/Cargo.toml index 726ce195d..f5fd25d98 100644 --- a/qt/bundle/win/Cargo.toml +++ b/qt/bundle/win/Cargo.toml @@ -9,10 +9,10 @@ license.workspace = true rust-version.workspace = true [dependencies] -anyhow = "1.0.66" -camino = "1.1.1" -clap = { version = "4.0.29", features = ["derive"] } -glob = "0.3.0" -tugger-windows-codesign = "0.9.0" +anyhow = "1.0.68" +camino = "1.1.2" +clap = { version = "4.1.1", features = ["derive"] } +glob = "0.3.1" +tugger-windows-codesign = "0.10.0" walkdir = "2.3.2" workspace-hack = { version = "0.1", path = "../../../tools/workspace-hack" } diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 48d878ea4..3593c68d7 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -27,7 +27,7 @@ required-features = ["bench"] # After updating anything below, run ../cargo/update.py [build-dependencies] -prost-build = "0.11.4" +prost-build = "0.11.6" which = "4.3.0" [dev-dependencies] @@ -49,16 +49,18 @@ csv = { git = "https://github.com/ankitects/rust-csv.git", rev = "1c9d3aab6f79a7 # pinned as any changes could invalidate sqlite indexes unicase = "=2.6.0" +# keep this at 0.4.19 until an Android-compatible update is ready +chrono = { version = "0.4.19", default-features = false, features = ["std", "clock"] } + criterion = { version = "0.4.0", optional = true } ammonia = "3.3.0" async-compression = { version = "0.3.15", features = ["zstd", "tokio"] } -async-trait = "0.1.59" -axum = { version = "0.6.1", features = ["multipart", "macros", "headers"] } +async-trait = "0.1.61" +axum = { version = "0.6.2", features = ["multipart", "macros", "headers"] } axum-client-ip = "0.3.1" blake3 = "1.3.3" bytes = "1.3.0" -chrono = { version = "0.4.19", default-features = false, features = ["std", "clock"] } coarsetime = "0.1.22" convert_case = "0.6.0" difflib = "0.4.0" @@ -73,29 +75,29 @@ hyper = "0.14.23" id_tree = "1.8.0" itertools = "0.10.5" lazy_static = "1.4.0" -nom = "7.1.1" +nom = "7.1.3" num-integer = "0.1.45" -num_cpus = "1.14.0" +num_cpus = "1.15.0" num_enum = "0.5.7" -once_cell = "1.16.0" +once_cell = "1.17.0" pin-project = "1.0.12" -prost = "0.11.3" +prost = "0.11.6" pulldown-cmark = "0.9.2" rand = "0.8.5" -regex = "1.7.0" +regex = "1.7.1" rusqlite = { version = "0.28.0", features = ["trace", "functions", "collation", "bundled"] } scopeguard = "1.1.0" -serde = "1.0.148" +serde = "1.0.152" serde-aux = "4.1.2" -serde_derive = "1.0.148" -serde_json = "1.0.89" -serde_repr = "0.1.9" +serde_derive = "1.0.152" +serde_json = "1.0.91" +serde_repr = "0.1.10" serde_tuple = "0.5.0" sha1 = "0.10.5" -snafu = { version = "0.7.3", features = ["backtraces"] } +snafu = { version = "0.7.4", features = ["backtraces"] } strum = { version = "0.24.1", features = ["derive"] } tempfile = "3.3.0" -tokio = { version = "1.23", features = ["fs", "rt-multi-thread", "macros"] } +tokio = { version = "1.24", features = ["fs", "rt-multi-thread", "macros"] } tokio-util = { version = "0.7.4", features = ["io"] } tower-http = { version = "0.3.5", features = ["trace"] } tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_debug"] } @@ -106,4 +108,4 @@ unicode-normalization = "0.1.22" utime = "0.3.1" workspace-hack = { version = "0.1", path = "../tools/workspace-hack" } zip = { version = "0.6.3", default-features = false, features = ["deflate", "time"] } -zstd = { version = "0.12.0", features = ["zstdmt"] } +zstd = { version = "0.12.2", features = ["zstdmt"] } diff --git a/rslib/i18n/Cargo.toml b/rslib/i18n/Cargo.toml index 2d8ba3a98..8544c2b41 100644 --- a/rslib/i18n/Cargo.toml +++ b/rslib/i18n/Cargo.toml @@ -18,17 +18,17 @@ path = "src/lib.rs" fluent-syntax = "0.11.0" fluent = "0.16.0" unic-langid = { version = "0.9.1", features = ["macros"] } -serde = { version = "1.0.148", features = ["derive"] } -serde_json = "1.0.89" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.91" inflections = "1.1.1" [dependencies] fluent = "0.16.0" fluent-bundle = "0.15.2" intl-memoizer = "0.5.1" -num-format = "0.4.3" +num-format = "0.4.4" phf = { version = "0.11.1", features = ["macros"] } -serde = { version = "1.0.148", features = ["derive"] } -serde_json = "1.0.89" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.91" unic-langid = { version = "0.9.1", features = ["macros"] } workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } diff --git a/rslib/i18n/build/gather.rs b/rslib/i18n/build/gather.rs index eb68776e8..3064e9691 100644 --- a/rslib/i18n/build/gather.rs +++ b/rslib/i18n/build/gather.rs @@ -50,7 +50,7 @@ fn add_folder(map: &mut TranslationsByLang, folder: &Path, lang: &str) { continue; } let module = fname.trim_end_matches(".ftl").replace('-', "_"); - let text = fs::read_to_string(&entry.path()).unwrap(); + let text = fs::read_to_string(entry.path()).unwrap(); assert!( text.ends_with('\n'), "file was missing final newline: {:?}", diff --git a/rslib/i18n/build/write_strings.rs b/rslib/i18n/build/write_strings.rs index 5d7e570f7..009d519e5 100644 --- a/rslib/i18n/build/write_strings.rs +++ b/rslib/i18n/build/write_strings.rs @@ -29,7 +29,7 @@ pub fn write_strings(map: &TranslationsByLang, modules: &[Module]) { let dir = PathBuf::from(std::env::var("OUT_DIR").unwrap()); let path = dir.join("strings.rs"); - fs::write(&path, buf).unwrap(); + fs::write(path, buf).unwrap(); } fn write_methods(modules: &[Module], buf: &mut String) { diff --git a/rslib/i18n_helpers/Cargo.toml b/rslib/i18n_helpers/Cargo.toml index 901173fbd..2e9f8e1c6 100644 --- a/rslib/i18n_helpers/Cargo.toml +++ b/rslib/i18n_helpers/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] fluent-syntax = "0.11.0" lazy_static = "1.4.0" -regex = "1.7.0" -serde_json = "1.0.89" +regex = "1.7.1" +serde_json = "1.0.91" walkdir = "2" workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } diff --git a/rslib/linkchecker/Cargo.toml b/rslib/linkchecker/Cargo.toml index 7c265f97a..62321a087 100644 --- a/rslib/linkchecker/Cargo.toml +++ b/rslib/linkchecker/Cargo.toml @@ -20,7 +20,7 @@ linkcheck = { git = "https://github.com/ankitects/linkcheck.git", rev = "2f20798 futures = "0.3.25" itertools = "0.10.5" strum = { version = "0.24.1", features = ["derive"] } -tokio = { version = "1.23.1", features = ["full"] } +tokio = { version = "1.24.2", features = ["full"] } workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } [features] diff --git a/rslib/src/collection/backup.rs b/rslib/src/collection/backup.rs index 22d222c11..631988c43 100644 --- a/rslib/src/collection/backup.rs +++ b/rslib/src/collection/backup.rs @@ -93,8 +93,8 @@ fn backup_inner>( fn write_backup>(col_data: &[u8], backup_folder: S, tr: &I18n) -> Result<()> { let out_path = - Path::new(&backup_folder).join(&format!("{}", Local::now().format(BACKUP_FORMAT_STRING))); - export_colpkg_from_data(&out_path, col_data, tr) + Path::new(&backup_folder).join(format!("{}", Local::now().format(BACKUP_FORMAT_STRING))); + export_colpkg_from_data(out_path, col_data, tr) } fn thin_backups>(backup_folder: P, limits: BackupLimits) -> Result<()> { diff --git a/rslib/src/decks/schema11.rs b/rslib/src/decks/schema11.rs index f379fa308..01a958801 100644 --- a/rslib/src/decks/schema11.rs +++ b/rslib/src/decks/schema11.rs @@ -371,7 +371,7 @@ impl From for DeckSchema11 { } else { Some(filt.delays.clone()) }, - preview_delay: filt.preview_delay as u32, + preview_delay: filt.preview_delay, common: deck.into(), }), } diff --git a/rslib/src/log.rs b/rslib/src/log.rs index 82c672f18..bedb509ec 100644 --- a/rslib/src/log.rs +++ b/rslib/src/log.rs @@ -70,7 +70,7 @@ fn maybe_rotate_log(path: &str) -> io::Result<()> { let path3 = format!("{}.2", path); // if a rotated file already exists, rename it - if let Err(e) = fs::rename(&path2, &path3) { + if let Err(e) = fs::rename(&path2, path3) { if e.kind() != io::ErrorKind::NotFound { return Err(e); } diff --git a/rslib/src/media/check.rs b/rslib/src/media/check.rs index e36ca3bf0..32eac22cb 100644 --- a/rslib/src/media/check.rs +++ b/rslib/src/media/check.rs @@ -321,7 +321,7 @@ where // if the original filename doesn't exist, we can just rename if let Err(e) = fs::metadata(&orig_path) { if e.kind() == io::ErrorKind::NotFound { - fs::rename(&dentry.path(), &orig_path)?; + fs::rename(dentry.path(), &orig_path)?; } else { return Err(e.into()); } @@ -544,12 +544,12 @@ pub(crate) mod test { let (_dir, mgr, mut col) = common_setup()?; // add some test files - write_file(&mgr.media_folder.join("zerobytes"), "")?; - create_dir(&mgr.media_folder.join("folder"))?; - write_file(&mgr.media_folder.join("normal.jpg"), "normal")?; - write_file(&mgr.media_folder.join("foo[.jpg"), "foo")?; - write_file(&mgr.media_folder.join("_under.jpg"), "foo")?; - write_file(&mgr.media_folder.join("unused.jpg"), "foo")?; + write_file(mgr.media_folder.join("zerobytes"), "")?; + create_dir(mgr.media_folder.join("folder"))?; + write_file(mgr.media_folder.join("normal.jpg"), "normal")?; + write_file(mgr.media_folder.join("foo[.jpg"), "foo")?; + write_file(mgr.media_folder.join("_under.jpg"), "foo")?; + write_file(mgr.media_folder.join("unused.jpg"), "foo")?; let progress = |_n| true; @@ -575,8 +575,8 @@ pub(crate) mod test { } ); - assert!(fs::metadata(&mgr.media_folder.join("foo[.jpg")).is_err()); - assert!(fs::metadata(&mgr.media_folder.join("foo.jpg")).is_ok()); + assert!(fs::metadata(mgr.media_folder.join("foo[.jpg")).is_err()); + assert!(fs::metadata(mgr.media_folder.join("foo.jpg")).is_ok()); assert_eq!( report, @@ -668,7 +668,7 @@ Unused: unused.jpg fn unicode_normalization() -> Result<()> { let (_dir, mgr, mut col) = common_setup()?; - write_file(&mgr.media_folder.join("ぱぱ.jpg"), "nfd encoding")?; + write_file(mgr.media_folder.join("ぱぱ.jpg"), "nfd encoding")?; let progress = |_n| true; @@ -694,7 +694,7 @@ Unused: unused.jpg trash_bytes: 0 } ); - assert!(fs::metadata(&mgr.media_folder.join("ぱぱ.jpg")).is_ok()); + assert!(fs::metadata(mgr.media_folder.join("ぱぱ.jpg")).is_ok()); } else { // on other platforms, the file should have been renamed to NFC assert_eq!( @@ -711,8 +711,8 @@ Unused: unused.jpg trash_bytes: 0 } ); - assert!(fs::metadata(&mgr.media_folder.join("ぱぱ.jpg")).is_err()); - assert!(fs::metadata(&mgr.media_folder.join("ぱぱ.jpg")).is_ok()); + assert!(fs::metadata(mgr.media_folder.join("ぱぱ.jpg")).is_err()); + assert!(fs::metadata(mgr.media_folder.join("ぱぱ.jpg")).is_ok()); } Ok(()) diff --git a/rslib/src/media/files.rs b/rslib/src/media/files.rs index 89c6b8a38..83e8b90ef 100644 --- a/rslib/src/media/files.rs +++ b/rslib/src/media/files.rs @@ -421,7 +421,7 @@ pub(crate) fn add_file_from_ankiweb( } pub(crate) fn data_for_file(media_folder: &Path, fname: &str) -> Result>> { - let mut file = match open_file(&media_folder.join(fname)) { + let mut file = match open_file(media_folder.join(fname)) { Err(e) if e.is_not_found() => return Ok(None), res => res?, }; diff --git a/rslib/src/notetype/mod.rs b/rslib/src/notetype/mod.rs index e9218161d..d017e9673 100644 --- a/rslib/src/notetype/mod.rs +++ b/rslib/src/notetype/mod.rs @@ -360,8 +360,7 @@ impl Notetype { // provided ordinal not on any existing field; cap to bounds self.config .sort_field_idx - .max(0) - .min((self.fields.len() - 1) as u32) + .clamp(0, (self.fields.len() - 1) as u32) }); } diff --git a/rslib/src/scheduler/states/fuzz.rs b/rslib/src/scheduler/states/fuzz.rs index 83b7fd639..3e438b854 100644 --- a/rslib/src/scheduler/states/fuzz.rs +++ b/rslib/src/scheduler/states/fuzz.rs @@ -37,7 +37,7 @@ impl<'a> StateContext<'a> { let (lower, upper) = constrained_fuzz_bounds(interval, minimum, maximum); (lower as f32 + fuzz_factor * ((1 + upper - lower) as f32)).floor() as u32 } else { - (interval.round() as u32).max(minimum).min(maximum) + (interval.round() as u32).clamp(minimum, maximum) } } @@ -60,8 +60,8 @@ fn constrained_fuzz_bounds(interval: f32, minimum: u32, maximum: u32) -> (u32, u // minimum <= maximum and lower <= upper are assumed // now ensure minimum <= lower <= upper <= maximum - lower = lower.max(minimum).min(maximum); - upper = upper.max(minimum).min(maximum); + lower = lower.clamp(minimum, maximum); + upper = upper.clamp(minimum, maximum); if upper == lower && upper > 2 && upper < maximum { upper = lower + 1; diff --git a/rslib/src/scheduler/states/mod.rs b/rslib/src/scheduler/states/mod.rs index 48343bf80..430f2cae1 100644 --- a/rslib/src/scheduler/states/mod.rs +++ b/rslib/src/scheduler/states/mod.rs @@ -113,7 +113,7 @@ impl<'a> StateContext<'a> { /// - `minimum` is as passed, but at least 1, and at most `maximum`. pub(crate) fn min_and_max_review_intervals(&self, minimum: u32) -> (u32, u32) { let maximum = self.maximum_review_interval.max(1); - let minimum = minimum.max(1).min(maximum); + let minimum = minimum.clamp(1, maximum); (minimum, maximum) } diff --git a/rslib/src/scheduler/states/review.rs b/rslib/src/scheduler/states/review.rs index 120342cee..b3a1ddd12 100644 --- a/rslib/src/scheduler/states/review.rs +++ b/rslib/src/scheduler/states/review.rs @@ -221,7 +221,7 @@ fn constrain_passing_interval(ctx: &StateContext, interval: f32, minimum: u32, f if fuzz { ctx.with_review_fuzz(interval, minimum, maximum) } else { - (interval.round() as u32).max(minimum).min(maximum) + (interval.round() as u32).clamp(minimum, maximum) } } diff --git a/rslib/src/scheduler/timing.rs b/rslib/src/scheduler/timing.rs index a57f3746f..36744ca8a 100644 --- a/rslib/src/scheduler/timing.rs +++ b/rslib/src/scheduler/timing.rs @@ -82,7 +82,7 @@ fn days_elapsed( /// Build a FixedOffset struct, capping minutes_west if out of bounds. pub(crate) fn fixed_offset_from_minutes(minutes_west: i32) -> FixedOffset { - let bounded_minutes = minutes_west.max(-23 * 60).min(23 * 60); + let bounded_minutes = minutes_west.clamp(-23 * 60, 23 * 60); FixedOffset::west_opt(bounded_minutes * 60).unwrap() } diff --git a/rslib/src/serde.rs b/rslib/src/serde.rs index a6ff3b260..62746a67c 100644 --- a/rslib/src/serde.rs +++ b/rslib/src/serde.rs @@ -63,7 +63,7 @@ impl FromI64 for i64 { impl FromI64 for TimestampSecs { fn from_i64(val: i64) -> Self { - TimestampSecs(val as i64) + TimestampSecs(val) } } diff --git a/rslib/src/sync/media/database/client/changetracker.rs b/rslib/src/sync/media/database/client/changetracker.rs index a67458c28..30d51b588 100644 --- a/rslib/src/sync/media/database/client/changetracker.rs +++ b/rslib/src/sync/media/database/client/changetracker.rs @@ -171,7 +171,7 @@ where } // any remaining entries from the database have been deleted - let removed: Vec<_> = mtimes.into_iter().map(|(k, _)| k).collect(); + let removed: Vec<_> = mtimes.into_keys().collect(); for f in &removed { debug!(fname = f, "db entry missing on disk"); } diff --git a/rslib/src/sync/version.rs b/rslib/src/sync/version.rs index 38842f993..ff67b5e17 100644 --- a/rslib/src/sync/version.rs +++ b/rslib/src/sync/version.rs @@ -49,7 +49,7 @@ impl SyncVersion { pub fn ensure_supported(&self) -> HttpResult<()> { if self.is_too_old() || self.is_too_new() { - None.or_bad_request(&format!("unsupported sync version: {}", self.0))?; + None.or_bad_request(format!("unsupported sync version: {}", self.0))?; } Ok(()) } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index ed12be3b1..4c90bd79b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] # older versions may fail to compile; newer versions may fail the clippy tests -channel = "1.65" +channel = "1.66.1" diff --git a/tools/workspace-hack/Cargo.toml b/tools/workspace-hack/Cargo.toml index 65874e06d..5707e4908 100644 --- a/tools/workspace-hack/Cargo.toml +++ b/tools/workspace-hack/Cargo.toml @@ -14,7 +14,6 @@ description = "workspace-hack package, managed by hakari" ### BEGIN HAKARI SECTION [dependencies] -bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } bytes = { version = "1", features = ["std"] } crossbeam-utils = { version = "0.8", features = ["std"] } either = { version = "1", features = ["use_std"] } @@ -28,6 +27,7 @@ hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] } hmac = { version = "0.12", default-features = false, features = ["reset"] } hyper = { version = "0.14", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } indexmap = { version = "1", default-features = false, features = ["std"] } +itertools = { version = "0.10", features = ["use_alloc", "use_std"] } log = { version = "0.4", default-features = false, features = ["std"] } num-traits = { version = "0.2", features = ["std"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } @@ -36,7 +36,6 @@ rand-c38e5c1d305a1b54 = { package = "rand", version = "0.8", features = ["alloc" rand-ca01ad9e24f5d932 = { package = "rand", version = "0.7", features = ["alloc", "getrandom", "getrandom_package", "libc", "rand_pcg", "small_rng", "std"] } rand_core = { version = "0.6", default-features = false, features = ["alloc", "getrandom", "std"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } -regex-automata = { version = "0.1", features = ["regex-syntax", "std"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } reqwest = { version = "0.11", features = ["__rustls", "__tls", "blocking", "default-tls", "hyper-rustls", "hyper-tls", "json", "mime_guess", "multipart", "native-tls", "native-tls-crate", "rustls", "rustls-native-certs", "rustls-pemfile", "rustls-tls", "rustls-tls-native-roots", "rustls-tls-webpki-roots", "serde_json", "socks", "stream", "tokio-native-tls", "tokio-rustls", "tokio-socks", "tokio-util", "webpki-roots"] } scopeguard = { version = "1", features = ["use_std"] } @@ -64,6 +63,7 @@ either = { version = "1", features = ["use_std"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] } indexmap = { version = "1", default-features = false, features = ["std"] } +itertools = { version = "0.10", features = ["use_alloc", "use_std"] } log = { version = "0.4", default-features = false, features = ["std"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } prost = { version = "0.11", features = ["prost-derive", "std"] }