From 7d7f9cfbf99238edc8b4c7f96dfc8832c7a38bad Mon Sep 17 00:00:00 2001 From: Spencer Ferris <3319370+spencewenski@users.noreply.github.com> Date: Fri, 29 Mar 2024 01:48:57 -0700 Subject: [PATCH] Fix cargo fmt command --- .cargo-husky/hooks/pre-push | 18 +++++++++--------- .github/workflows/ci.yml | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.cargo-husky/hooks/pre-push b/.cargo-husky/hooks/pre-push index 3c4b0b75..8bea4b43 100755 --- a/.cargo-husky/hooks/pre-push +++ b/.cargo-husky/hooks/pre-push @@ -1,25 +1,25 @@ #!/usr/bin/env bash # Checks that don't depend on which features are enabled -echo "### cargo fmt -- --check ###" -cargo fmt --workspace -- --check -echo "### cargo clippy --no-deps -- -D warnings ###" +echo "### fmt --all -- --check ###" +cargo fmt --all -- --check +echo "### clippy --workspace -- -D warnings ###" cargo clippy --workspace -- -D warnings # Without default features -echo "### cargo test --no-default-features ###" +echo "### test --no-default-features --workspace ###" cargo test --no-default-features --workspace -echo "### cargo check --no-default-features ###" +echo "### check --no-default-features --workspace ###" cargo check --no-default-features --workspace # With default features -echo "### cargo test ###" +echo "### test --workspace ###" cargo test --workspace -echo "### cargo check ###" +echo "### check --workspace ###" cargo check --workspace # With all features -echo "### cargo test --all-features ###" +echo "### test --all-features --workspace ###" cargo test --all-features --workspace -echo "### cargo check --all-features ###" +echo "### check --all-features --workspace ###" cargo check --all-features --workspace diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85c26097..8d53978f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Clippy - run: cargo clippy --workspace --no-deps -- -D warnings + run: cargo clippy --workspace -- -D warnings check_formatting: name: Formatting @@ -74,4 +74,4 @@ jobs: steps: - uses: actions/checkout@v4 - name: Formatting - run: cargo fmt --workspace -- --check + run: cargo fmt --all -- --check