From 317ae88cf78b3b77fd9186220c49dbefcbb104f6 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Fri, 17 Jan 2025 23:26:40 +0800 Subject: [PATCH 1/4] ci(github): uses clippy action --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5da8a4..2b4532c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ env: CARGO_TERM_COLOR: always JAVA_VERSION: 23 +permissions: + checks: write + jobs: style_rustfmt: name: Style / rustfmt @@ -65,7 +68,11 @@ jobs: - run: cargo check --all-targets --all-features --verbose name: Cargo check - name: Run clippy - run: cargo clippy --no-deps --all-targets --all-features -- -D warnings + uses: auguwu/clippy-action@1.4.0 + with: + check-args: --all-targets --all-features --verbose + args: -D warnings + token: ${{secrets.GITHUB_TOKEN}} unit_test: name: Test / unit From dcfb1e75a6aa3af3f2ae3d5993d319e9dec4201a Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Sat, 18 Jan 2025 15:01:34 +0800 Subject: [PATCH 2/4] ci: use action for rustfmt --- .github/workflows/ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b4532c..22dfbbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,18 +38,13 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: stable - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: corretto - uses: actions/checkout@v4 name: Checkout source code - name: Check code formatting with rustfmt - run: cargo fmt --check + uses: actions-rust-lang/rustfmt@v1 style_clippy_check: - name: Style / clippy & check + name: Style / clippy runs-on: ubuntu-latest steps: - name: Setup Rust @@ -65,8 +60,6 @@ jobs: name: Checkout source code - name: Restore Rust Build Cache uses: Leafwing-Studios/cargo-cache@v2 - - run: cargo check --all-targets --all-features --verbose - name: Cargo check - name: Run clippy uses: auguwu/clippy-action@1.4.0 with: From 031e234afb12880fdb17512e439be7642b400337 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Sat, 18 Jan 2025 15:14:27 +0800 Subject: [PATCH 3/4] ci: test style violation --- src/jvm/class_loader/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jvm/class_loader/mod.rs b/src/jvm/class_loader/mod.rs index e7ba0db..b91b777 100644 --- a/src/jvm/class_loader/mod.rs +++ b/src/jvm/class_loader/mod.rs @@ -8,7 +8,7 @@ use super::{Class, ClassLoader}; /// An error that can occur while loading a class. #[derive(thiserror::Error, Debug)] -pub enum Error { +pub enum Error { /// The class could not be found. #[error("Class not found")] NotFound, @@ -38,6 +38,7 @@ where ::Target: ClassPath, { fn find_class(&self, binary_name: &str) -> Result { + let x = 10; self.deref().find_class(binary_name) } } From 1ffb9f5058af3d8dbf1e071ab83b16ccf7eb6aeb Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Sat, 18 Jan 2025 15:28:38 +0800 Subject: [PATCH 4/4] Revert "ci: test style violation" This reverts commit 031e234afb12880fdb17512e439be7642b400337. --- src/jvm/class_loader/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/jvm/class_loader/mod.rs b/src/jvm/class_loader/mod.rs index b91b777..e7ba0db 100644 --- a/src/jvm/class_loader/mod.rs +++ b/src/jvm/class_loader/mod.rs @@ -8,7 +8,7 @@ use super::{Class, ClassLoader}; /// An error that can occur while loading a class. #[derive(thiserror::Error, Debug)] -pub enum Error { +pub enum Error { /// The class could not be found. #[error("Class not found")] NotFound, @@ -38,7 +38,6 @@ where ::Target: ClassPath, { fn find_class(&self, binary_name: &str) -> Result { - let x = 10; self.deref().find_class(binary_name) } }