From e563224b525a32cd131783593516cde3122de141 Mon Sep 17 00:00:00 2001
From: DustInDark <nextsasasa@gmail.com>
Date: Mon, 21 Mar 2022 12:45:30 +0900
Subject: [PATCH] added clippy workflow #428 (#429)

* added clippy workflow #428

* fixed action yaml to run clippy #428

* fixed indent

* fixed workflow

* fixed workflow error

* fixed indent

* changed no annotation #428

* adujusted annotation version

* fixed clippy::needless_match

* remove if let exception

* removed unnecessary permission check #428
---
 .github/workflows/rust.yml | 37 ++++++++++++++++++++++---------------
 src/detections/rule/mod.rs |  6 +++---
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 121f514c..54f14bea 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -14,19 +14,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly
-        profile: minimal
-        components: rustfmt
-        override: true
-    - name: Fmt Check
-      run: cargo fmt -- --check
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          components: rustfmt
+          override: true
+      - name: Fmt Check
+        run: cargo fmt -- --check
+      - name: Prepare Clippy
+        run: rustup component add clippy
+      - name: Run clippy action to produce annotations
+        uses: actions-rs/clippy-check@v1
+        with:
+          args: --all-targets -- -D warnings
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose
 
diff --git a/src/detections/rule/mod.rs b/src/detections/rule/mod.rs
index a1ce8ba3..ec2b56b9 100644
--- a/src/detections/rule/mod.rs
+++ b/src/detections/rule/mod.rs
@@ -92,10 +92,10 @@ impl RuleNode {
     }
     /// ルール内のAggregationParseInfo(Aggregation Condition)を取得する関数
     pub fn get_agg_condition(&self) -> Option<&AggregationParseInfo> {
-        match self.detection.aggregation_condition.as_ref() {
-            None => None,
-            Some(agg_parse_info) => Some(agg_parse_info),
+        if self.detection.aggregation_condition.as_ref().is_some() {
+            return self.detection.aggregation_condition.as_ref();
         }
+        None
     }
 }