From 8330abd3d42aadc30d1d819c9486c1341b4244c9 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Wed, 23 Sep 2020 14:50:44 +0200 Subject: fix lints --- src/analyzers/fractals.rs | 10 +++------- src/analyzers/helpers.rs | 7 +++---- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'src/analyzers') diff --git a/src/analyzers/fractals.rs b/src/analyzers/fractals.rs index 637096a..85063bc 100644 --- a/src/analyzers/fractals.rs +++ b/src/analyzers/fractals.rs @@ -18,13 +18,9 @@ pub const AI_HAS_DARK_MODE_SKILL: u32 = 61_356; /// If the whole log is in dark phase, `Some(0)` is returned. fn get_dark_phase_start(log: &Log) -> Option { // Determine if we even have a dark phase. - if !log.events().iter().any(|event| { - if let EventKind::SkillUse { skill_id, .. } = event.kind() { - *skill_id == AI_HAS_DARK_MODE_SKILL - } else { - false - } - }) { + if !log.events().iter().any(|event| + matches!(event.kind(), EventKind::SkillUse { skill_id, ..} if *skill_id == AI_HAS_DARK_MODE_SKILL) + ) { return None; }; diff --git a/src/analyzers/helpers.rs b/src/analyzers/helpers.rs index 674d752..b5042aa 100644 --- a/src/analyzers/helpers.rs +++ b/src/analyzers/helpers.rs @@ -29,10 +29,9 @@ pub fn boss_health(log: &Log) -> Option { /// Death is determined by checking for the [`EventKind::ChangeDead`][EventKind::ChangeDead] event, /// and whether a NPC is a boss is determined by the [`Log::is_boss`][Log::is_boss] method. pub fn boss_is_dead(log: &Log) -> bool { - log.events().iter().any(|ev| match ev.kind() { - EventKind::ChangeDead { agent_addr } if log.is_boss(*agent_addr) => true, - _ => false, - }) + log.events().iter().any( + |ev| matches!(ev.kind(), EventKind::ChangeDead { agent_addr } if log.is_boss(*agent_addr)), + ) } /// Checks whether the players exit combat after the boss. -- cgit v1.2.3