* 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
This commit is contained in:
37
.github/workflows/rust.yml
vendored
37
.github/workflows/rust.yml
vendored
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user