From 22e0d0ffc79516e5ccddadd72bc667de8030bf89 Mon Sep 17 00:00:00 2001 From: Alexander Koz Date: Tue, 21 Nov 2023 00:07:48 +0400 Subject: [PATCH] Update deps, fix breaking changes of deps, bump versions, fix rust toolchain channel. Now feature `sdk_2_1` (`gfx/sdk_2_1` & `sprite/sdk_2_1`) is enabled by default. * CI: - disable clechasseur/rs-fmt-check action - reset manifest & lock that changed by tests (cmd: `new` & `init`) - set minimal SDK version for tests on CI (older versions are works, it just to do not mess extra with features like `sdk_ver`). --- .github/workflows/tests.yml | 18 +- Cargo.lock | 946 +++++++++++++------------- Cargo.toml | 2 +- api/gfx/Cargo.toml | 4 +- api/gfx/src/api.rs | 2 +- api/gfx/src/text.rs | 2 +- api/playdate/Cargo.toml | 3 +- api/sprite/Cargo.toml | 4 +- cargo/Cargo.toml | 14 +- cargo/src/assets/mod.rs | 7 +- cargo/src/build/mod.rs | 2 +- cargo/src/cli/mod.rs | 10 +- cargo/src/cli/opts.rs | 4 + cargo/src/main.rs | 2 +- cargo/src/utils/logging.rs | 10 +- codemagic.yaml | 5 + components/crank-indicator/Cargo.toml | 2 +- components/crank-indicator/src/lib.rs | 1 - rust-toolchain.toml | 2 +- support/bindgen-cfg/Cargo.toml | 2 +- support/bindgen/Cargo.toml | 8 +- support/bindgen/src/lib.rs | 2 +- support/build/Cargo.toml | 4 +- support/build/src/assets/mod.rs | 6 +- support/build/src/assets/resolver.rs | 5 +- support/tool/Cargo.toml | 4 +- support/utils/Cargo.toml | 2 +- 27 files changed, 527 insertions(+), 546 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 09a2449b..79ea8f39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,7 @@ jobs: sdk: # - beta - latest - - 2.0.1 + - 2.1.0 steps: - uses: actions/checkout@v4 @@ -225,7 +225,7 @@ jobs: sdk: # - beta - latest - - 2.0.1 + - 2.1.0 steps: - uses: actions/checkout@v4 @@ -323,7 +323,7 @@ jobs: sdk: # - beta - latest - - 2.0.1 + - 2.1.0 steps: - uses: actions/checkout@v4 @@ -408,12 +408,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Check - if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }} - uses: clechasseur/rs-fmt-check@v2 - with: - toolchain: nightly + # - name: Check + # if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }} + # uses: clechasseur/rs-fmt-check@v2.0.1 + # # with: + # # toolchain: nightly - name: Check - if: ${{ github.event_name != 'pull_request' && github.event_name != 'pull_request_target' }} + # if: ${{ github.event_name != 'pull_request' && github.event_name != 'pull_request_target' }} run: cargo fmt -- --check diff --git a/Cargo.lock b/Cargo.lock index ded5b4db..85baa661 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,19 +19,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.2" @@ -101,12 +88,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -139,9 +120,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -156,8 +137,8 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", - "which", + "syn 2.0.39", + "which 4.4.2", ] [[package]] @@ -190,31 +171,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "brownstone" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5839ee4f953e811bfdcf223f509cb2c6a3e1447959b0bff459405575bc17f22" -dependencies = [ - "arrayvec 0.7.4", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "regex-automata 0.4.3", @@ -254,6 +215,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +[[package]] +name = "byteyarn" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff" + [[package]] name = "bzip2" version = "0.4.4" @@ -277,10 +244,12 @@ dependencies = [ [[package]] name = "cargo" -version = "0.74.0" +version = "0.75.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244574fb9c19dfe9b9d11cd6398f718aca7d11fb4f0d46f22cd867876a6c4c56" +checksum = "5fd077f2cb74b87f972015dc436ee3ea87292539d16d1d4d3e62303105e7a7b4" dependencies = [ + "anstream", + "anstyle", "anyhow", "base64", "bytesize", @@ -291,12 +260,12 @@ dependencies = [ "cargo-platform", "cargo-util", "clap", + "color-print", "crates-io", "curl", "curl-sys", "filetime", "flate2", - "fwdansi", "git2", "git2-curl", "gix", @@ -309,8 +278,8 @@ dependencies = [ "humantime", "ignore", "im-rc", - "indexmap 2.0.2", - "itertools", + "indexmap", + "itertools 0.10.5", "jobserver", "lazycell", "libc", @@ -325,18 +294,17 @@ dependencies = [ "rustfix", "semver", "serde", + "serde-untagged", "serde-value", "serde_ignored", "serde_json", "sha1", "shell-escape", - "strip-ansi-escapes", - "syn 2.0.38", + "syn 2.0.39", "tar", "tempfile", - "termcolor", "time", - "toml", + "toml 0.7.8", "toml_edit 0.19.15", "tracing", "tracing-subscriber", @@ -350,9 +318,9 @@ dependencies = [ [[package]] name = "cargo-credential" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626c6c87f7906515d241db80b2e35e6818ea771da38003dec873914d417f48b5" +checksum = "1eb63e2bf69272d1d7236a7d3083a75a8437c9ce69465a1665caa7c3a213d757" dependencies = [ "anyhow", "libc", @@ -365,9 +333,9 @@ dependencies = [ [[package]] name = "cargo-credential-libsecret" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbb9372b45e669060bba532a7a78f7e05a5791d8450eceab93006d72a542ee4" +checksum = "7ad243e36ec5bc20e738b36fbcc42533da99cffacb90ef0d6dfe8b9d791a1f80" dependencies = [ "anyhow", "cargo-credential", @@ -376,9 +344,9 @@ dependencies = [ [[package]] name = "cargo-credential-macos-keychain" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a07e26e78213508bf6007c9187f48ef1c98584d912d8195496828f30b7e2796" +checksum = "8c1d7aa6dbc2e1764071e3ea97539df2e9ebf5512302062917a5cca9c9a95a63" dependencies = [ "cargo-credential", "security-framework", @@ -386,9 +354,9 @@ dependencies = [ [[package]] name = "cargo-credential-wincred" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637491b9d0fe5350a839903742de909c01e8440b2eadb561177039cbd8f0c71" +checksum = "66a1db314f0de303d822d44531e52d20919e9ed6fc08ebcaf0ec7226e4825eb7" dependencies = [ "cargo-credential", "windows-sys", @@ -396,24 +364,25 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] [[package]] name = "cargo-playdate" -version = "0.3.11" +version = "0.3.12" dependencies = [ + "anstyle", "anyhow", "byteorder", "cargo", "cargo-platform", "cargo-util", "clap", - "clap_lex 0.5.1", + "clap_lex", "dirs", "env_logger", "fs_extra", @@ -428,9 +397,8 @@ dependencies = [ "serde", "serde_json", "target", - "termcolor", - "toml", - "toml_edit 0.20.5", + "toml 0.8.8", + "toml_edit 0.20.7", "try-lazy-init", "walkdir", "zip", @@ -438,9 +406,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d" +checksum = "ce8c7905217be3315c7adb1f195a74fc38f586eefd8adfe398921eee8472d348" dependencies = [ "anyhow", "core-foundation", @@ -512,9 +480,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -522,13 +490,13 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", + "clap_lex", "strsim", "terminal_size", "unicase", @@ -544,15 +512,9 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - [[package]] name = "clap_lex" version = "0.6.0" @@ -565,6 +527,27 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" +[[package]] +name = "color-print" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -650,9 +633,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd35a7899c7804e2f8e305438d7b70a852c0424009f3ac29ca4f6733f2aec85" +checksum = "1aadfd000bd635ce58527e2dffe008339867991ab12a786b859d9cfe967c0f72" dependencies = [ "curl", "percent-encoding", @@ -692,9 +675,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -811,9 +794,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest", @@ -840,9 +823,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -859,11 +842,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -878,6 +870,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", +] + [[package]] name = "erased_set" version = "0.7.0" @@ -886,9 +887,9 @@ checksum = "76a5aa24577083f8190ad401e376b55887c7cd9083ae95d83ceec5d28ea78125" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -921,9 +922,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "filetime" @@ -979,16 +980,6 @@ dependencies = [ "new_debug_unreachable", ] -[[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1002,9 +993,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1015,11 +1006,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -1030,9 +1021,9 @@ dependencies = [ [[package]] name = "git2-curl" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" +checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3" dependencies = [ "curl", "git2", @@ -1042,9 +1033,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.45.1" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2a03ec66ee24d1b2bae3ab718f8d14f141613810cb7ff6756f7db667f1cd82" +checksum = "ad6d32e74454459690d57d18ea4ebec1629936e6b130b51d12cb4a81630ac953" dependencies = [ "gix-actor", "gix-attributes", @@ -1055,6 +1046,7 @@ dependencies = [ "gix-diff", "gix-discover", "gix-features", + "gix-filter", "gix-fs", "gix-glob", "gix-hash", @@ -1062,29 +1054,32 @@ dependencies = [ "gix-ignore", "gix-index", "gix-lock", - "gix-mailmap", + "gix-macros", "gix-negotiate", "gix-object", "gix-odb", "gix-pack", "gix-path", + "gix-pathspec", "gix-prompt", "gix-protocol", "gix-ref", "gix-refspec", "gix-revision", + "gix-revwalk", "gix-sec", + "gix-submodule", "gix-tempfile", + "gix-trace", "gix-transport", "gix-traverse", "gix-url", "gix-utils", "gix-validate", "gix-worktree", - "log", "once_cell", + "parking_lot", "prodash", - "signal-hook", "smallvec", "thiserror", "unicode-normalization", @@ -1092,30 +1087,30 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.21.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838" +checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" dependencies = [ - "bstr 1.7.0", + "bstr", "btoi", "gix-date", "itoa", - "nom", "thiserror", + "winnow", ] [[package]] name = "gix-attributes" -version = "0.13.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31" +checksum = "2451665e70709ba4753b623ef97511ee98c4a73816b2c5b5df25678d607ed820" dependencies = [ - "bstr 1.7.0", + "bstr", + "byteyarn", "gix-glob", "gix-path", "gix-quote", - "kstring", - "log", + "gix-trace", "smallvec", "thiserror", "unicode-bom", @@ -1145,16 +1140,16 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7" dependencies = [ - "bstr 1.7.0", + "bstr", ] [[package]] name = "gix-commitgraph" -version = "0.16.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09" +checksum = "e75a975ee22cf0a002bfe9b5d5cb3d2a88e263a8a178cd7509133cff10f4df8a" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-chunk", "gix-features", "gix-hash", @@ -1164,34 +1159,33 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.23.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c" +checksum = "c171514b40487d3f677ae37efc0f45ac980e3169f23c27eb30a70b47fdf88ab5" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-config-value", "gix-features", "gix-glob", "gix-path", "gix-ref", "gix-sec", - "log", "memchr", - "nom", "once_cell", "smallvec", "thiserror", "unicode-bom", + "winnow", ] [[package]] name = "gix-config-value" -version = "0.12.5" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897" +checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ "bitflags 2.4.1", - "bstr 1.7.0", + "bstr", "gix-path", "libc", "thiserror", @@ -1199,11 +1193,11 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.15.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65" +checksum = "46900b884cc5af6a6c141ee741607c0c651a4e1d33614b8d888a1ba81cc0bc8a" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-command", "gix-config-value", "gix-path", @@ -1215,11 +1209,11 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902" +checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" dependencies = [ - "bstr 1.7.0", + "bstr", "itoa", "thiserror", "time", @@ -1227,23 +1221,22 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.30.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33" +checksum = "788ddb152c388206e81f36bcbb574e7ed7827c27d8fa62227b34edc333d8928c" dependencies = [ "gix-hash", "gix-object", - "imara-diff", "thiserror", ] [[package]] name = "gix-discover" -version = "0.19.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46" +checksum = "69507643d75a0ea9a402fcf73ced517d2b95cc95385904ac09d03e0b952fde33" dependencies = [ - "bstr 1.7.0", + "bstr", "dunce", "gix-hash", "gix-path", @@ -1254,15 +1247,16 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.30.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314" +checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" dependencies = [ "bytes", "crc32fast", "crossbeam-channel", "flate2", "gix-hash", + "gix-trace", "libc", "once_cell", "parking_lot", @@ -1272,55 +1266,75 @@ dependencies = [ "walkdir", ] +[[package]] +name = "gix-filter" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be40d28cd41445bb6cd52c4d847d915900e5466f7433eaee6a9e0a3d1d88b08" +dependencies = [ + "bstr", + "encoding_rs", + "gix-attributes", + "gix-command", + "gix-hash", + "gix-object", + "gix-packetline-blocking", + "gix-path", + "gix-quote", + "gix-trace", + "smallvec", + "thiserror", +] + [[package]] name = "gix-fs" -version = "0.2.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5" +checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.8.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e" +checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ "bitflags 2.4.1", - "bstr 1.7.0", + "bstr", "gix-features", "gix-path", ] [[package]] name = "gix-hash" -version = "0.11.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" +checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" dependencies = [ - "hex", + "faster-hex", "thiserror", ] [[package]] name = "gix-hashtable" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d" +checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", - "hashbrown 0.14.2", + "hashbrown", "parking_lot", ] [[package]] name = "gix-ignore" -version = "0.3.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625" +checksum = "b048f443a1f6b02da4205c34d2e287e3fd45d75e8e2f06cfb216630ea9bff5e3" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-glob", "gix-path", "unicode-bom", @@ -1328,16 +1342,17 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.17.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616ba958fabfb11263fa042c35690d48a6c7be4e9277e2c7e24ff263b3fe7b82" +checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ "bitflags 2.4.1", - "bstr 1.7.0", + "bstr", "btoi", "filetime", "gix-bitmap", "gix-features", + "gix-fs", "gix-hash", "gix-lock", "gix-object", @@ -1350,9 +1365,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "6.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2" +checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" dependencies = [ "gix-tempfile", "gix-utils", @@ -1360,57 +1375,59 @@ dependencies = [ ] [[package]] -name = "gix-mailmap" -version = "0.13.0" +name = "gix-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a" +checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" dependencies = [ - "bstr 1.7.0", - "gix-actor", - "thiserror", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] name = "gix-negotiate" -version = "0.2.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c" +checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" dependencies = [ "bitflags 2.4.1", "gix-commitgraph", + "gix-date", "gix-hash", "gix-object", - "gix-revision", + "gix-revwalk", "smallvec", "thiserror", ] [[package]] name = "gix-object" -version = "0.30.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7" +checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" dependencies = [ - "bstr 1.7.0", + "bstr", "btoi", "gix-actor", + "gix-date", "gix-features", "gix-hash", "gix-validate", - "hex", "itoa", - "nom", "smallvec", "thiserror", + "winnow", ] [[package]] name = "gix-odb" -version = "0.46.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b234d806278eeac2f907c8b5a105c4ba537230c1a9d9236d822bf0db291f8f3" +checksum = "8d6a392c6ba3a2f133cdc63120e9bc7aec81eef763db372c817de31febfe64bf" dependencies = [ "arc-swap", + "gix-date", "gix-features", "gix-hash", "gix-object", @@ -1424,20 +1441,18 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.36.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2a14cb3156037eedb17d6cb7209b7180522b8949b21fd0fe3184c0a1d0af88" +checksum = "7536203a45b31e1bc5694bbf90ba8da1b736c77040dd6a520db369f371eb1ab3" dependencies = [ "clru", "gix-chunk", - "gix-diff", "gix-features", "gix-hash", "gix-hashtable", "gix-object", "gix-path", "gix-tempfile", - "gix-traverse", "memmap2", "parking_lot", "smallvec", @@ -1450,29 +1465,55 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a8384b1e964151aff0d5632dd9b191059d07dff358b96bd940f1b452600d7ab" dependencies = [ - "bstr 1.7.0", + "bstr", + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-packetline-blocking" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d8395f7501c84d6a1fe902035fdfd8cd86d89e2dd6be0200ec1a72fd3c92d39" +dependencies = [ + "bstr", "faster-hex", "thiserror", ] [[package]] name = "gix-path" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c" +checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-trace", "home", "once_cell", "thiserror", ] +[[package]] +name = "gix-pathspec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" +dependencies = [ + "bitflags 2.4.1", + "bstr", + "gix-attributes", + "gix-config-value", + "gix-glob", + "gix-path", + "thiserror", +] + [[package]] name = "gix-prompt" -version = "0.5.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea" +checksum = "5c9a913769516f5e9d937afac206fb76428e3d7238e538845842887fda584678" dependencies = [ "gix-command", "gix-config-value", @@ -1483,19 +1524,20 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.33.2" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a17058b45c461f0847528c5fb6ee6e76115e026979eb2d2202f98ee94f6c24" +checksum = "cc7b700dc20cc9be8a5130a1fd7e10c34117ffa7068431c8c24d963f0a2e0c9b" dependencies = [ - "bstr 1.7.0", + "bstr", "btoi", "gix-credentials", + "gix-date", "gix-features", "gix-hash", "gix-transport", "maybe-async", - "nom", "thiserror", + "winnow", ] [[package]] @@ -1504,18 +1546,19 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" dependencies = [ - "bstr 1.7.0", + "bstr", "btoi", "thiserror", ] [[package]] name = "gix-ref" -version = "0.30.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c" +checksum = "22e6b749660b613641769edc1954132eb8071a13c32224891686091bef078de4" dependencies = [ "gix-actor", + "gix-date", "gix-features", "gix-fs", "gix-hash", @@ -1525,17 +1568,17 @@ dependencies = [ "gix-tempfile", "gix-validate", "memmap2", - "nom", "thiserror", + "winnow", ] [[package]] name = "gix-refspec" -version = "0.11.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4" +checksum = "0895cb7b1e70f3c3bd4550c329e9f5caf2975f97fcd4238e05754e72208ef61e" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-hash", "gix-revision", "gix-validate", @@ -1545,26 +1588,28 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.15.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7" +checksum = "c8c4b15cf2ab7a35f5bcb3ef146187c8d36df0177e171ca061913cbaaa890e89" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-date", "gix-hash", "gix-hashtable", "gix-object", "gix-revwalk", + "gix-trace", "thiserror", ] [[package]] name = "gix-revwalk" -version = "0.1.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca" +checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" dependencies = [ "gix-commitgraph", + "gix-date", "gix-hash", "gix-hashtable", "gix-object", @@ -1574,9 +1619,9 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7" +checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ "bitflags 2.4.1", "gix-path", @@ -1584,18 +1629,31 @@ dependencies = [ "windows", ] +[[package]] +name = "gix-submodule" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0150e82e9282d3f2ab2dd57a22f9f6c3447b9d9856e5321ac92d38e3e0e2b7" +dependencies = [ + "bstr", + "gix-config", + "gix-path", + "gix-pathspec", + "gix-refspec", + "gix-url", + "thiserror", +] + [[package]] name = "gix-tempfile" -version = "6.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10" +checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" dependencies = [ "gix-fs", "libc", "once_cell", "parking_lot", - "signal-hook", - "signal-hook-registry", "tempfile", ] @@ -1607,12 +1665,12 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" [[package]] name = "gix-transport" -version = "0.32.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a39ffed9a9078ed700605e064b15d7c6ae50aa65e7faa36ca6919e8081df15" +checksum = "b9ec726e6a245e68ace59a34126a1d679de60360676612985e70b0d3b102fb4e" dependencies = [ "base64", - "bstr 1.7.0", + "bstr", "curl", "gix-command", "gix-credentials", @@ -1626,23 +1684,27 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.26.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0842e984cb4bf26339dc559f3a1b8bf8cdb83547799b2b096822a59f87f33d9" +checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" dependencies = [ + "gix-commitgraph", + "gix-date", "gix-hash", "gix-hashtable", "gix-object", + "gix-revwalk", + "smallvec", "thiserror", ] [[package]] name = "gix-url" -version = "0.19.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863" +checksum = "6125ecf46e8c68bf7202da6cad239831daebf0247ffbab30210d72f3856e420f" dependencies = [ - "bstr 1.7.0", + "bstr", "gix-features", "gix-path", "home", @@ -1661,22 +1723,21 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" +checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" dependencies = [ - "bstr 1.7.0", + "bstr", "thiserror", ] [[package]] name = "gix-worktree" -version = "0.18.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d388ad962e8854402734a7387af8790f6bdbc8d05349052dab16ca4a0def50f6" +checksum = "9f5e32972801bd82d56609e6fc84efc358fa1f11f25c5e83b7807ee2280f14fe" dependencies = [ - "bstr 1.7.0", - "filetime", + "bstr", "gix-attributes", "gix-features", "gix-fs", @@ -1686,8 +1747,6 @@ dependencies = [ "gix-index", "gix-object", "gix-path", - "io-close", - "thiserror", ] [[package]] @@ -1703,7 +1762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.7.0", + "bstr", "fnv", "log", "regex", @@ -1720,12 +1779,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.2" @@ -1861,40 +1914,14 @@ dependencies = [ "version_check", ] -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash", - "hashbrown 0.12.3", -] - -[[package]] -name = "indent_write" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" - [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -1906,16 +1933,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "is-terminal" version = "0.4.9" @@ -1936,6 +1953,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1971,30 +1997,15 @@ dependencies = [ "libc", ] -[[package]] -name = "joinery" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" - [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kstring" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" -dependencies = [ - "static_assertions", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -2009,15 +2020,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -2057,6 +2068,17 @@ dependencies = [ "libc", ] +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libssh2-sys" version = "0.3.0" @@ -2106,9 +2128,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -2186,9 +2208,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -2244,19 +2266,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom-supreme" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd3ae6c901f1959588759ff51c95d24b491ecb9ff91aa9c2ef4acc5b1dcab27" -dependencies = [ - "brownstone", - "indent_write", - "joinery", - "memchr", - "nom", -] - [[package]] name = "normpath" version = "1.1.1" @@ -2306,7 +2315,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788" dependencies = [ - "bstr 1.7.0", + "bstr", "normpath", "winapi", ] @@ -2319,9 +2328,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -2578,7 +2587,7 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "playdate" -version = "0.1.13" +version = "0.1.14" dependencies = [ "playdate-controls", "playdate-display", @@ -2594,7 +2603,7 @@ dependencies = [ [[package]] name = "playdate-bindgen" -version = "0.1.2" +version = "0.1.3" dependencies = [ "bindgen", "clap", @@ -2608,20 +2617,20 @@ dependencies = [ "proc-macro2", "quote", "semver", - "syn 2.0.38", - "which", + "syn 2.0.39", + "which 5.0.0", ] [[package]] name = "playdate-bindgen-cfg" -version = "0.1.1" +version = "0.1.2" dependencies = [ "clap", ] [[package]] name = "playdate-build" -version = "0.2.0" +version = "0.2.1" dependencies = [ "crate-metadata", "dirs", @@ -2632,13 +2641,13 @@ dependencies = [ "serde", "serde_json", "symlink", - "toml", + "toml 0.8.8", "wax", ] [[package]] name = "playdate-build-utils" -version = "0.1.2" +version = "0.1.3" dependencies = [ "dirs", "log", @@ -2678,7 +2687,7 @@ dependencies = [ [[package]] name = "playdate-graphics" -version = "0.3.11" +version = "0.3.12" dependencies = [ "playdate-color", "playdate-display", @@ -2717,7 +2726,7 @@ dependencies = [ [[package]] name = "playdate-sprite" -version = "0.2.7" +version = "0.2.8" dependencies = [ "playdate-display", "playdate-graphics", @@ -2729,7 +2738,7 @@ dependencies = [ name = "playdate-sys" version = "0.2.11" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "playdate-bindgen", "playdate-bindgen-cfg", ] @@ -2743,7 +2752,7 @@ dependencies = [ [[package]] name = "playdate-tool" -version = "0.1.3" +version = "0.1.4" dependencies = [ "clap", "env_logger", @@ -2760,7 +2769,7 @@ dependencies = [ [[package]] name = "playdate-ui-crank-indicator" -version = "0.1.2" +version = "0.1.3" dependencies = [ "playdate-controls", "playdate-display", @@ -2773,12 +2782,12 @@ dependencies = [ [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64", - "indexmap 1.9.3", + "indexmap", "line-wrap", "quick-xml", "serde", @@ -2819,14 +2828,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ "elliptic-curve", ] @@ -2842,9 +2851,9 @@ dependencies = [ [[package]] name = "prodash" -version = "25.0.2" +version = "26.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d67eb4220992a4a052a4bb03cf776e493ecb1a3a36bab551804153d63486af7" +checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" dependencies = [ "parking_lot", ] @@ -2862,9 +2871,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -2917,15 +2926,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -2946,12 +2946,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -3039,9 +3039,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -3134,13 +3134,23 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba3ac59c62f51b75a6bfad8840b2ede4a81ff5cc23c200221ef479ae75a4aa3" +dependencies = [ + "erased-serde", + "serde", +] + [[package]] name = "serde-value" version = "0.7.0" @@ -3153,13 +3163,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3173,9 +3183,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3240,30 +3250,11 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", "rand_core", @@ -3287,9 +3278,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" @@ -3311,12 +3302,6 @@ dependencies = [ "der", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "string_cache" version = "0.8.7" @@ -3343,15 +3328,6 @@ dependencies = [ "quote", ] -[[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - [[package]] name = "strsim" version = "0.10.0" @@ -3383,9 +3359,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -3434,9 +3410,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -3468,7 +3444,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3539,6 +3515,18 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + [[package]] name = "toml_datetime" version = "0.6.5" @@ -3554,7 +3542,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -3563,11 +3551,24 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.2", + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -3593,7 +3594,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3608,9 +3609,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -3619,9 +3620,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -3664,9 +3665,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -3708,9 +3709,9 @@ dependencies = [ [[package]] name = "usb-ids" -version = "1.2023.6" +version = "1.2023.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313d37a4508b2a268a62bc68217fef4df82537c5db1af8469824d2892ac05c34" +checksum = "ba8af4170a2e6ebc0e18ce6024c8c844bc07f3101ab5d1ad7dedfd1c6fb116cb" dependencies = [ "nom", "phf 0.11.2", @@ -3749,27 +3750,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec 0.5.2", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "walkdir" version = "2.4.0" @@ -3788,9 +3768,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3798,24 +3778,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3823,37 +3803,34 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wax" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c7a3bac6110ac062b7b422a442b7ee23e07209e2784a036654cab1e71bbafc" +checksum = "8d12a78aa0bab22d2f26ed1a96df7ab58e8a93506a3e20adb47c51a93b4e1357" dependencies = [ - "bstr 0.2.17", "const_format", - "itertools", + "itertools 0.11.0", "nom", - "nom-supreme", "pori", "regex", - "smallvec", "thiserror", "walkdir", ] @@ -3870,6 +3847,19 @@ dependencies = [ "rustix", ] +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3978,9 +3968,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -3996,31 +3986,11 @@ dependencies = [ "markup5ever", ] -[[package]] -name = "zerocopy" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" diff --git a/Cargo.toml b/Cargo.toml index ab5b2eb2..ceb3e4bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,4 +43,4 @@ env_logger = "0.10" clap = "4.4" serde = "1.0" serde_json = "1.0" -toml = "0.7" +toml = "0.8" diff --git a/api/gfx/Cargo.toml b/api/gfx/Cargo.toml index 1da9fca3..c4f578db 100644 --- a/api/gfx/Cargo.toml +++ b/api/gfx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-graphics" -version = "0.3.11" +version = "0.3.12" readme = "README.md" description = "High-level graphics API built on-top of Playdate API" keywords = ["playdate", "sdk", "api", "gamedev"] @@ -60,7 +60,7 @@ features = [ "sys/bindings-derive-ord", "sys/bindings-derive-partialeq", "sys/bindings-derive-partialord", - # "sdk_2_1" + "sdk_2_1" ] rustdoc-args = ["--cfg", "docsrs", "--show-type-layout"] default-target = "thumbv7em-none-eabihf" diff --git a/api/gfx/src/api.rs b/api/gfx/src/api.rs index 04fe32e9..4069f12b 100644 --- a/api/gfx/src/api.rs +++ b/api/gfx/src/api.rs @@ -174,7 +174,7 @@ impl crate::text::api::Api for Cache { /// Equivalent to [`sys::ffi::playdate_graphics::setTextLeading`] #[doc(alias = "sys::ffi::playdate_graphics::setTextLeading")] #[inline(always)] - fn set_text_leading(&self) -> unsafe extern "C" fn(lineHeightAdustment: c_int) { + fn set_text_leading(&self) -> unsafe extern "C" fn(lineHeightAdjustment: c_int) { self.0.setTextLeading.expect("setTextLeading") } } diff --git a/api/gfx/src/text.rs b/api/gfx/src/text.rs index 48027744..921f759e 100644 --- a/api/gfx/src/text.rs +++ b/api/gfx/src/text.rs @@ -648,7 +648,7 @@ pub mod api { /// Equivalent to [`sys::ffi::playdate_graphics::setTextLeading`] #[doc(alias = "sys::ffi::playdate_graphics::setTextLeading")] #[inline(always)] - fn set_text_leading(&self) -> unsafe extern "C" fn(lineHeightAdustment: c_int) { + fn set_text_leading(&self) -> unsafe extern "C" fn(lineHeightAdjustment: c_int) { *sys::api!(graphics.setTextLeading) } } diff --git a/api/playdate/Cargo.toml b/api/playdate/Cargo.toml index 69524b6b..f42d36dd 100644 --- a/api/playdate/Cargo.toml +++ b/api/playdate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate" -version = "0.1.13" +version = "0.1.14" readme = "README.md" description = "High-level Playdate API" keywords = ["playdate", "sdk", "api", "gamedev"] @@ -39,6 +39,7 @@ default = [ "sprite/default", "system/default", "entry-point", + "sdk_2_1" ] # SDK v2.1 compatibility diff --git a/api/sprite/Cargo.toml b/api/sprite/Cargo.toml index 6597927d..699ae9c5 100644 --- a/api/sprite/Cargo.toml +++ b/api/sprite/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-sprite" -version = "0.2.7" +version = "0.2.8" readme = "README.md" description = "High-level sprite API built on-top of Playdate API" keywords = ["playdate", "sdk", "api", "gamedev"] @@ -19,7 +19,7 @@ repository.workspace = true [features] -default = ["sys/default", "gfx/default"] +default = ["sys/default", "gfx/default", "sdk_2_1"] sdk_2_1 = ["gfx/sdk_2_1"] diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml index 697f289e..113c62bf 100644 --- a/cargo/Cargo.toml +++ b/cargo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-playdate" -version = "0.3.11" +version = "0.3.12" readme = "README.md" description = "Build tool for neat yellow console." keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"] @@ -27,13 +27,13 @@ path = "src/main.rs" once_cell = "1.18" try-lazy-init = "0.0.2" -clap_lex = "0.5" +clap_lex = "0.6" dirs.workspace = true fs_extra.workspace = true -cargo = "=0.74.0" -cargo-util = "=0.2.6" -cargo-platform = "0.1.4" +cargo = "=0.75.0" +cargo-util = "=0.2.7" +cargo-platform = "0.1.5" semver.workspace = true serde = { workspace = true, features = ["derive"] } @@ -41,12 +41,12 @@ serde_json.workspace = true toml.workspace = true toml_edit = { version = "0.20", features = ["serde"] } regex.workspace = true -byteorder = "1.4" +byteorder = "1.5" zip = { version = "0.6.6", features = ["time"] } walkdir = "2.4" anyhow = "1.0" -termcolor = "1.3" +anstyle = "1" env_logger.workspace = true log.workspace = true diff --git a/cargo/src/assets/mod.rs b/cargo/src/assets/mod.rs index 82741296..f69d7c3d 100644 --- a/cargo/src/assets/mod.rs +++ b/cargo/src/assets/mod.rs @@ -2,6 +2,7 @@ use std::borrow::Cow; use std::collections::{HashMap, HashSet}; use std::path::{PathBuf, Path}; +use anstyle::AnsiColor as Color; use anyhow::bail; use cargo::CargoResult; use cargo::core::{Package, Verbosity}; @@ -257,8 +258,7 @@ pub fn build<'cfg>(config: &'cfg Config) -> CargoResult> { path.display() ); - config.log() - .status_with_color("Error", message, termcolor::Color::Red) + config.log().status_with_color("Error", message, Color::Red) }, }; } @@ -285,8 +285,7 @@ pub fn build<'cfg>(config: &'cfg Config) -> CargoResult> { }, Err(err) => { let msg = format!("build {kind_prefix}assets with pdc failed: {err}"); - config.log() - .status_with_color("Error", msg, termcolor::Color::Red); + config.log().status_with_color("Error", msg, Color::Red); if !config.compile_options.build_config.keep_going { bail!("Assets build failed."); } diff --git a/cargo/src/build/mod.rs b/cargo/src/build/mod.rs index 3bda8f54..b5c5fcc0 100644 --- a/cargo/src/build/mod.rs +++ b/cargo/src/build/mod.rs @@ -21,7 +21,7 @@ use playdate::compile::static_lib_suffix; use playdate::io::soft_link_checked; use playdate::toolchain::gcc::ArmToolchain; use playdate::toolchain::sdk::Sdk; -use termcolor::Color; +use anstyle::AnsiColor as Color; use crate::cli::cmd::Cmd; use crate::config::Config; diff --git a/cargo/src/cli/mod.rs b/cargo/src/cli/mod.rs index 5aea6f42..d39c9572 100644 --- a/cargo/src/cli/mod.rs +++ b/cargo/src/cli/mod.rs @@ -528,11 +528,11 @@ fn adapt_args_for_underlying_cargo(cmd: &Cmd, let raw_arg = arg.to_value_os(); let is_escape = arg.is_escape(); let maybe_cmd = !meet_cmd && - !(arg.is_empty() && - is_escape && - arg.is_long() && - arg.is_short() && - arg.is_number() && + !(arg.is_empty() || + is_escape || + arg.is_long() || + arg.is_short() || + arg.is_negative_number() || arg.is_stdio()); if maybe_cmd { diff --git a/cargo/src/cli/opts.rs b/cargo/src/cli/opts.rs index e9b9eedb..cd0219ae 100644 --- a/cargo/src/cli/opts.rs +++ b/cargo/src/cli/opts.rs @@ -132,6 +132,8 @@ fn build() -> Command { ) .arg_future_incompat_report() .arg_timings() + // Issue: https://github.com/clap-rs/clap/issues/5081 + ._arg(flag("keep-going", "Do not abort the build as soon as there is an error")) // hide currently not supported targets: .mut_arg("test", |arg| arg.hide(true)) .mut_arg("tests", |arg| arg.hide(true)) @@ -165,6 +167,8 @@ fn run() -> Command { ) .arg_future_incompat_report() .arg_timings() + // Issue: https://github.com/clap-rs/clap/issues/5081 + ._arg(flag("keep-going", "Do not abort the build as soon as there is an error")) // add exclusive shorthands: .args(special_args_for(&Cmd::Run)) .arg(extra_arg()) diff --git a/cargo/src/main.rs b/cargo/src/main.rs index 79ea95a6..304257b6 100644 --- a/cargo/src/main.rs +++ b/cargo/src/main.rs @@ -14,7 +14,7 @@ use cargo::core::Verbosity; use cargo::core::compiler::{CrateType, CompileKind}; use cargo::util::{CargoResult, Config as CargoConfig}; use config::Config; -use termcolor::Color; +use anstyle::AnsiColor as Color; use crate::utils::cargo::CompileKindExt; diff --git a/cargo/src/utils/logging.rs b/cargo/src/utils/logging.rs index 788c145d..bdf36802 100644 --- a/cargo/src/utils/logging.rs +++ b/cargo/src/utils/logging.rs @@ -5,7 +5,7 @@ use std::ops::DerefMut; use cargo::core::Shell; use cargo::util::machine_message::Message; -use termcolor::Color; +use anstyle::AnsiColor as Color; use crate::config::Config; use crate::logger::LogErr; @@ -29,7 +29,10 @@ impl> CargoLogger { pub fn status_with_color(&mut self, status: T, message: U, color: Color) where T: Display, U: Display { - self.0.status_with_color(status, message, color).log_err().ok(); + self.0 + .status_with_color(status, message, &color.on_default()) + .log_err() + .ok(); } /// Prints a red 'error' status message. @@ -42,7 +45,8 @@ impl> CargoLogger { spans: vec![] } }; self.0.print_json(&msg) } else { - self.0.status_with_color("Error", message, Color::Red) + self.0 + .status_with_color("Error", message, &Color::Red.on_default()) }.log_err() .ok(); } diff --git a/codemagic.yaml b/codemagic.yaml index ee36eac8..6cf737ea 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -235,6 +235,11 @@ workflows: cargo test -p=cargo-playdate -- --nocapture rm -rf ./target/tmp + - name: Reset manifests + script: | + git checkout HEAD -- ./Cargo.toml + git checkout HEAD -- ./Cargo.lock + - name: Execution script: | source "$HOME/.cargo/env" diff --git a/components/crank-indicator/Cargo.toml b/components/crank-indicator/Cargo.toml index 359a4501..1b179c80 100644 --- a/components/crank-indicator/Cargo.toml +++ b/components/crank-indicator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-ui-crank-indicator" -version = "0.1.2" +version = "0.1.3" readme = "README.md" description = "Crank Indicator UI component." edition.workspace = true diff --git a/components/crank-indicator/src/lib.rs b/components/crank-indicator/src/lib.rs index 93fa49c4..14ac1bca 100644 --- a/components/crank-indicator/src/lib.rs +++ b/components/crank-indicator/src/lib.rs @@ -4,7 +4,6 @@ extern crate alloc; extern crate sys; -use core::ffi::c_int; use core::ffi::c_uint; use core::marker::PhantomData; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cb5bf8da..b925678b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly" +channel = "nightly-2023-11-10" profile = "minimal" targets = ["thumbv7em-none-eabihf"] components = [ diff --git a/support/bindgen-cfg/Cargo.toml b/support/bindgen-cfg/Cargo.toml index 5781c18e..75d7541d 100644 --- a/support/bindgen-cfg/Cargo.toml +++ b/support/bindgen-cfg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-bindgen-cfg" -version = "0.1.1" +version = "0.1.2" readme = "README.md" description = "Minimal configuration for playdate-bindgen." keywords = ["playdate", "bindings", "ffi", "code-generation"] diff --git a/support/bindgen/Cargo.toml b/support/bindgen/Cargo.toml index c91ccbad..865f1e3e 100644 --- a/support/bindgen/Cargo.toml +++ b/support/bindgen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-bindgen" -version = "0.1.2" +version = "0.1.3" readme = "README.md" description = "Bindgen configuration for Playdate API and utils." keywords = ["playdate", "bindings", "ffi", "code-generation"] @@ -20,19 +20,19 @@ html2md = { version = "0.2.14", optional = true } html5ever = { version = "0.26.0", optional = true } markup5ever_rcdom = { version = "0.2.0", optional = true } # doc-gen: -proc-macro2 = { version = "1.0.66", optional = true } +proc-macro2 = { version = "1.0", optional = true } syn = { version = "2.0", optional = true } # +full, extra-traits, visit-mut quote = { version = "1.0", optional = true } log = { workspace = true, optional = true } prettyplease = { version = "0.2", optional = true, features = ["verbatim"] } -which = { version = "4.2", optional = true, default-features = false } +which = { version = "5.0", optional = true, default-features = false } utils.workspace = true bindgen-cfg = { workspace = true, features = ["clap"] } [dependencies.bindgen] -version = "=0.68.1" +version = "=0.69.1" default-features = false [dependencies.clap] diff --git a/support/bindgen/src/lib.rs b/support/bindgen/src/lib.rs index f9f31769..0b28e8e3 100644 --- a/support/bindgen/src/lib.rs +++ b/support/bindgen/src/lib.rs @@ -240,7 +240,7 @@ fn create_builder(_target: &str, capi: &Path, header: &Path, derive: &cfg::Deriv .generate_comments(true); - builder = builder.parse_callbacks(Box::new(bindgen::CargoCallbacks)); + builder = builder.parse_callbacks(Box::new(bindgen::CargoCallbacks::new())); if !derive.copy { builder = builder.parse_callbacks(Box::new(DeriveCopyToPrimitives)); } diff --git a/support/build/Cargo.toml b/support/build/Cargo.toml index 07b1af86..2b87108d 100644 --- a/support/build/Cargo.toml +++ b/support/build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-build" -version = "0.2.0" +version = "0.2.1" readme = "README.md" description = "Utils that help to build package for Playdate" keywords = ["playdate", "package", "encoding", "manifest", "assets"] @@ -21,7 +21,7 @@ toml = { workspace = true, optional = true } dirs.workspace = true fs_extra.workspace = true regex.workspace = true -wax = "0.5" +wax = "0.6" symlink = "0.1" [dependencies.crate-metadata] diff --git a/support/build/src/assets/mod.rs b/support/build/src/assets/mod.rs index 17e6d746..d76a9a80 100644 --- a/support/build/src/assets/mod.rs +++ b/support/build/src/assets/mod.rs @@ -188,7 +188,7 @@ fn log_err(err: Err) -> Err { #[derive(Debug)] pub enum Error { Io(std::io::Error), - Wax(wax::BuildError<'static>), + Wax(wax::BuildError), Walk(WalkError), Error(String), } @@ -197,8 +197,8 @@ pub enum Error { impl From for Error { fn from(err: std::io::Error) -> Self { Self::Io(err) } } -impl From> for Error { - fn from(err: wax::BuildError<'static>) -> Self { Self::Wax(err) } +impl From for Error { + fn from(err: wax::BuildError) -> Self { Self::Wax(err) } } impl From for Error { fn from(err: WalkError) -> Self { Self::Walk(err) } diff --git a/support/build/src/assets/resolver.rs b/support/build/src/assets/resolver.rs index 3e632e33..5fc7940d 100644 --- a/support/build/src/assets/resolver.rs +++ b/support/build/src/assets/resolver.rs @@ -17,11 +17,10 @@ pub fn resolve_includes, Excl: AsRef>(expr: S, exclude: &[Excl], links: LinkBehavior) -> Result, Error> { - let glob = Glob::new(expr.as_ref()).map_err(BuildError::into_owned)?; + let glob = Glob::new(expr.as_ref())?; let exclude = exclude.into_iter().map(AsRef::as_ref).chain(["**/.*/**"]); let walker = glob.walk_with_behavior(&crate_root, links) - .not(exclude) - .map_err(BuildError::into_owned)? + .not(exclude)? .map(|res| res.map(|entry| Match::from(entry))); let files = walker.map(|res| { diff --git a/support/tool/Cargo.toml b/support/tool/Cargo.toml index ed060ca0..4167ce07 100644 --- a/support/tool/Cargo.toml +++ b/support/tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-tool" -version = "0.1.3" +version = "0.1.4" readme = "README.md" description = "Tool for interaction with Playdate device and sim." keywords = ["playdate", "usb", "utility"] @@ -26,7 +26,7 @@ thiserror = "1.0" serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -plist = "1.5" +plist = "1.6" rusb = { version = "0.9", optional = true } usb-ids = { version = "1.2023.0", optional = true } diff --git a/support/utils/Cargo.toml b/support/utils/Cargo.toml index 751d16c8..ef183f66 100644 --- a/support/utils/Cargo.toml +++ b/support/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playdate-build-utils" -version = "0.1.2" +version = "0.1.3" readme = "README.md" description = "Utils that help to build program with Rust and Playdate API" keywords = ["playdate", "utility"]