Fix clippy in trunk

kkrt-labs · Oct 3, 2023 · f9690c4 · f9690c4
1 parent 546ad6a
commit f9690c4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 26 deletions.
diff --git a/.github/workflows/trunk-check.yaml b/.github/workflows/trunk-check.yaml
@@ -23,5 +23,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -6,17 +6,24 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.2.4
+      ref: v1.2.5
       uri: https://github.com/trunk-io/plugins
 runtimes:
   enabled:
     - node@18.12.1
     - python@3.10.8
 lint:
+  definitions:
+    - name: clippy
+      commands:
+        - run:
+            cargo clippy --message-format json --locked --workspace
+            --all-features --all-targets -- --cap-lints=warn --no-deps -D
+            warnings
   enabled:
     - actionlint@1.6.26
     - checkov@2.4.9
-    - clippy@1.65.0
+    - clippy@SYSTEM
     - git-diff-check
     - markdownlint@0.37.0
     - osv-scanner@1.4.0
@@ -30,6 +37,6 @@ actions:
   disabled:
     - trunk-announce
     - trunk-fmt-pre-commit
-  enabled:
     - trunk-check-pre-push
+  enabled:
     - trunk-upgrade-available
diff --git a/blockchain-tests-skip.yml b/blockchain-tests-skip.yml
@@ -614,29 +614,29 @@ filename:
     - tooLongReturnDataCopy.json # ef-tests #319
     - revertRetDataSize.json # ef-tests #320
   stRevertTest:
-    - "RevertOpcodeMultipleSubCalls.json" # ef-tests #322
-    - "RevertPrefoundCall.json" # ef-tests #322
-    - "LoopCallsDepthThenRevert.json" # ef-tests #322
-    - "stateRevert.json" # ef-tests #322
-    - "RevertDepthCreateOOG.json" # ef-tests #322
-    - "costRevert.json" # ef-tests #322
-    - "LoopDelegateCallsDepthThenRevert.json" # ef-tests #322
-    - "RevertOpcodeInCallsOnNonEmptyReturnData.json" # ef-tests #322
-    - "RevertOpcodeCalls.json" # ef-tests #322
-    - "LoopCallsThenRevert.json" # ef-tests #322
-    - "TouchToEmptyAccountRevert2.json" # ef-tests #322
-    - "TouchToEmptyAccountRevert3.json" # ef-tests #322
-    - "RevertDepthCreateAddressCollision.json" # ef-tests #322
-    - "RevertPrecompiledTouchExactOOG.json" # ef-tests #323
-    - "RevertPrefound.json" # ef-tests #323
-    - "RevertPrefoundEmpty.json" # ef-tests #323
-    - "RevertOpcodeCreate.json" # ef-tests #323
-    - "RevertOnEmptyStack.json" # ef-tests #323
-    - "RevertInCreateInInit.json" # ef-tests #323
-    - "RevertPrefoundEmptyCall.json" # ef-tests #323
-    - "LoopCallsDepthThenRevert2.json" # ef-tests #324
-    - "LoopCallsDepthThenRevert3.json" # ef-tests #324
-    - "RevertRemoteSubCallStorageOOG.json" # ef-tests #324
+    - RevertOpcodeMultipleSubCalls.json # ef-tests #322
+    - RevertPrefoundCall.json # ef-tests #322
+    - LoopCallsDepthThenRevert.json # ef-tests #322
+    - stateRevert.json # ef-tests #322
+    - RevertDepthCreateOOG.json # ef-tests #322
+    - costRevert.json # ef-tests #322
+    - LoopDelegateCallsDepthThenRevert.json # ef-tests #322
+    - RevertOpcodeInCallsOnNonEmptyReturnData.json # ef-tests #322
+    - RevertOpcodeCalls.json # ef-tests #322
+    - LoopCallsThenRevert.json # ef-tests #322
+    - TouchToEmptyAccountRevert2.json # ef-tests #322
+    - TouchToEmptyAccountRevert3.json # ef-tests #322
+    - RevertDepthCreateAddressCollision.json # ef-tests #322
+    - RevertPrecompiledTouchExactOOG.json # ef-tests #323
+    - RevertPrefound.json # ef-tests #323
+    - RevertPrefoundEmpty.json # ef-tests #323
+    - RevertOpcodeCreate.json # ef-tests #323
+    - RevertOnEmptyStack.json # ef-tests #323
+    - RevertInCreateInInit.json # ef-tests #323
+    - RevertPrefoundEmptyCall.json # ef-tests #323
+    - LoopCallsDepthThenRevert2.json # ef-tests #324
+    - LoopCallsDepthThenRevert3.json # ef-tests #324
+    - RevertRemoteSubCallStorageOOG.json # ef-tests #324
   stShift:
     - shiftCombinations.json # ef-tests #383
     - shiftSignedCombinations.json # ef-tests #383