diff --git a/.forgejo/workflows/push-main.yml b/.forgejo/workflows/push-main.yml index e8cfaed..3c362bb 100644 --- a/.forgejo/workflows/push-main.yml +++ b/.forgejo/workflows/push-main.yml @@ -22,13 +22,13 @@ jobs: with: fetch-depth: 0 - name: Run release-plz release-pr - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: release-plz release-pr --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - name: Run release-plz release - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: release-plz release --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} env: diff --git a/.forgejo/workflows/push-next.yml b/.forgejo/workflows/push-next.yml index e96e07a..8415129 100644 --- a/.forgejo/workflows/push-next.yml +++ b/.forgejo/workflows/push-next.yml @@ -27,26 +27,26 @@ jobs: uses: kemitix/todo-checker@v1.1.0 - name: Machete - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: ${{ matrix.toolchain.name }} cargo machete - name: Format - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: ${{ matrix.toolchain.name }} cargo fmt --all -- --check - name: Clippy - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset clippy - name: Build - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset build - name: Test - uses: https://git.kemitix.net/kemitix/rust@v2.3.0 + uses: https://git.kemitix.net/kemitix/rust@v2.4.1 with: args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset test diff --git a/Cargo.lock b/Cargo.lock index dd50e46..1a2d412 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,23 +322,26 @@ dependencies = [ [[package]] name = "bon" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b71187ef9d11cfa48c023d574a00ec5e4850dcb145ef51619d99cc119486cb" +checksum = "32649b2d94d4dae1084cffd2ce1a778165e887497e4d1d55cd3976839f76194e" dependencies = [ "bon-macros", + "rustversion", ] [[package]] name = "bon-macros" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8407447d440da7b3de982f286d15e30e7646bef4ebca994eebebaa1690fd9c" +checksum = "13823053b3090fb2a35940608b0ff4c9254eb97651a971cf49fd84f8604c2591" dependencies = [ "darling", "ident_case", + "prettyplease", "proc-macro2", "quote", + "rustversion", "syn 2.0.82", ] @@ -1124,7 +1127,7 @@ dependencies = [ "ratatui", "regex", "rstest", - "secrecy 0.10.3", + "secrecy", "sendmail", "serde_json", "standardwebhooks", @@ -1157,7 +1160,7 @@ dependencies = [ "pike", "pretty_assertions", "rand", - "secrecy 0.10.3", + "secrecy", "serde", "serde_json", "take-until", @@ -1178,7 +1181,7 @@ dependencies = [ "git-next-core", "kxio", "rand", - "secrecy 0.10.3", + "secrecy", "serde", "serde_json", "tokio", @@ -1198,7 +1201,7 @@ dependencies = [ "hmac", "kxio", "rand", - "secrecy 0.10.3", + "secrecy", "serde", "serde_json", "sha2", @@ -2640,22 +2643,16 @@ dependencies = [ [[package]] name = "kxio" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3dd097e810dd8348c82d8f3da1548bcd03dbfa744456dae7194a977e0c50a9" +checksum = "866086a5a345e4aaae12cd9d35ba0a794935fdaa67c779e1c76bd0109d219e27" dependencies = [ - "async-trait", "derive_more", "http 1.1.0", "path-clean", "reqwest", - "secrecy 0.8.0", - "serde", - "serde-xml-rs", - "serde_json", "tempfile", - "thiserror", - "tracing", + "url", ] [[package]] @@ -3248,6 +3245,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn 2.0.82", +] + [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -3259,9 +3266,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -3711,15 +3718,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "zeroize", -] - [[package]] name = "secrecy" version = "0.10.3" @@ -3773,18 +3771,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - [[package]] name = "serde_derive" version = "1.0.209" @@ -5020,12 +5006,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "xml-rs" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" - [[package]] name = "yansi" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index a6fc39a..b52c48c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ async-trait = "0.1" git-url-parse = "0.4" # fs/network -kxio = { version = "1.2" } +kxio = { version = "2.0" } # TOML parsing serde = { version = "1.0", features = ["derive"] } @@ -81,7 +81,7 @@ time = "0.3" standardwebhooks = "1.0" # boilerplate -bon = "2.0" +bon = "3.0" derive_more = { version = "1.0.0-beta", features = [ "as_ref", "constructor",