ci: fix issues from last commit

bluurryy · Apr 5, 2024 · dcb1554 · dcb1554
1 parent 58778e1
commit dcb1554
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -25,7 +25,7 @@ jobs:
         run: cd crates/test-fallibility && cargo fmt --all -- --check
       - name: format fuzz
         run: cd fuzz && cargo fmt --all -- --check
-  check:
+  clippy:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -38,22 +38,22 @@ jobs:
     - name: install rustup
       run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
     - name: install rust
-      run: rustup install ${{matrix.rust_channel}} && rustup default ${{matrix.rust_channel}}
+      run: rustup install ${{matrix.rust_channel}} --component clippy && rustup default ${{matrix.rust_channel}}
     - uses: actions/checkout@v4
     - name: cargo clippy (without feature_set)
       run: cargo clippy --all --tests --verbose
     - name: cargo clippy (with feature_set)
       run: cargo clippy --all --tests --verbose ${{matrix.feature_set}}
-  check-benches:
+  clippy-benches:
     runs-on: ubuntu-latest
     steps:
     - name: Install rustup
       run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
     - name: Install rust nightly
-      run: rustup install nightly && rustup default nightly
+      run: rustup install nightly --component clippy && rustup default nightly
     - uses: actions/checkout@v4
     - name: Check that benches build
-      run: cargo check --benches --all-features
+      run: cargo clippy --benches --all-features
   test:
     runs-on: ubuntu-latest
     env:

diff --git a/crates/inspect-asm/src/lib.rs b/crates/inspect-asm/src/lib.rs
@@ -23,7 +23,8 @@ trait BumpaloExt {
 }
 
 type Bump<const MIN_ALIGN: usize, const UP: bool> = bump_scope::Bump<Global, MIN_ALIGN, UP>;
-type MutBumpVec<'b, 'a, T, const MIN_ALIGN: usize, const UP: bool> = bump_scope::MutBumpVec<'b, 'a, T, Global, MIN_ALIGN, UP>;
+type MutBumpVec<'b, 'a, T, const MIN_ALIGN: usize, const UP: bool> =
+    bump_scope::MutBumpVec<'b, 'a, T, Global, MIN_ALIGN, UP>;
 type MutBumpVecRev<'b, 'a, T, const MIN_ALIGN: usize, const UP: bool> =
     bump_scope::MutBumpVecRev<'b, 'a, T, Global, MIN_ALIGN, UP>;
 

diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/justfile b/justfile
@@ -9,19 +9,32 @@ default *args:
   cargo clippy --all --tests
 
 all:
+  just fmt
+  just clippy
   just doc
-  cargo fmt --all
-  cargo clippy --all --tests
-  cargo clippy --all --tests --no-default-features
-  cargo clippy --all --tests --no-default-features --features alloc
-  cd crates/fuzzing-support; cargo fmt; cargo clippy
   just check-msrv
   just check-nooom
   cargo test --all-features
   cargo miri test --all-features
   just test-fallibility
   just inspect-asm
-
+
+fmt:
+  cargo fmt --all
+  cd crates/fuzzing-support; cargo fmt --all
+  cd crates/inspect-asm; cargo fmt --all
+  cd crates/test-fallibility; cargo fmt --all
+  cd fuzz; cargo fmt --all
+
+clippy:
+  cargo clippy --all --tests
+  cargo clippy --all --tests --no-default-features
+  cargo clippy --all --tests --no-default-features --features alloc
+  cd crates/fuzzing-support; cargo clippy --all --tests
+  cd crates/inspect-asm; cargo clippy --all --tests
+  cd crates/test-fallibility; cargo clippy --all --tests
+  cd fuzz; cargo clippy --all --tests
+
 spellcheck:
   # https://www.npmjs.com/package/cspell
   cspell lint --gitignore "**/*.{rs,md,toml}"