diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5843e63f6..230078a83 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,4 +33,4 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: components: rustfmt - - run: rustfmt +nightly --edition 2018 --check $(find . -type f -iname *.rs) + - run: rustfmt +nightly --edition 2021 --check $(find . -type f -iname *.rs) diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index aca386a00..4e2f14e1d 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -17,7 +17,7 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: components: rustfmt - - run: rustfmt +nightly --edition 2018 $(find . -type f -iname *.rs) + - run: rustfmt +nightly --edition 2021 $(find . -type f -iname *.rs) - name: Create Pull Request uses: peter-evans/create-pull-request@v7 with: @@ -25,7 +25,7 @@ jobs: signoff: true title: rustfmt body: | - Changes from `rustfmt +nightly --edition 2018 $(find . -type f -iname *.rs)`. + Changes from `rustfmt +nightly --edition 2021 $(find . -type f -iname *.rs)`. branch: rustfmt # Delete branch when merged delete-branch: true diff --git a/deny.toml b/deny.toml index 580be6cb1..2f1704961 100644 --- a/deny.toml +++ b/deny.toml @@ -91,3 +91,9 @@ name = "miniz_oxide" name = "thiserror" [[bans.skip]] name = "thiserror-impl" + +# 2 deps from 2 different version of rustls-native-certs not fully upgradeable yet +[[bans.skip]] +name = "security-framework" +[[bans.skip]] +name = "core-foundation" diff --git a/rustfmt.toml b/rustfmt.toml index 0efbfe09e..77b5e1e80 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,5 @@ +# https://github.com/kube-rs/kube/issues/707 +unstable_features = true overflow_delimited_expr = true newline_style = "Unix" imports_granularity = "Crate"