From 6c98127365fdf88c49410b92773c41214fdb46ee Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Sun, 18 Feb 2024 09:26:10 +0100 Subject: [PATCH] Remove group imports format checking It makes too many suboptimal choices for now. See https://github.com/rust-lang/rustfmt/issues/5083#issuecomment-1951001501 and https://github.com/rust-lang/rustfmt/issues/5083#issuecomment-1951011779 --- .github/workflows/check.yml | 17 ----------------- Makefile | 5 ----- 2 files changed, 22 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e9a5aff3..f2a3fe3d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -34,23 +34,6 @@ jobs: components: rustfmt - name: cargo fmt --check run: cargo fmt --check - # This is currently a dedicated job due to the rustfmt's `group_imports` configuration - # option being available on the nightly channel only as of February 2024. - # Once stabilized, can be merged with the `stable / fmt` job in this workflow. - # See: https://github.com/rust-lang/rustfmt/issues/5083 - imports: - runs-on: ubuntu-latest - name: nightly / fmt (import grouping) - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install nightly - uses: dtolnay/rust-toolchain@nightly - with: - components: rustfmt - - name: cargo +nightly fmt -- --config group_imports=one --check - run: cargo +nightly fmt -- --config group_imports=one --check clippy: runs-on: ubuntu-latest name: ${{ matrix.toolchain }} / clippy diff --git a/Makefile b/Makefile index 23782039..6e23d9c0 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ check: cargo fmt --check cargo clippy cargo d --no-deps --all-features - cargo +nightly fmt -- --config group_imports=one --check .PHONY: doc doc: @@ -36,10 +35,6 @@ faktory/tls: faktory/tls/kill: docker compose -f docker/compose.yml down -.PHONY: sort -sort: - cargo +nightly fmt -- --config group_imports=one - .PHONY: test test: cargo t --locked --all-features --all-targets