aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel <kingdread@gmx.de>2020-10-04 12:04:19 +0200
committerDaniel <kingdread@gmx.de>2020-10-04 12:04:19 +0200
commitdd46cead3d4b5aaf5731f5e5104927651f3e2b64 (patch)
tree2e99e0299d2363a97a8cb92275260677a66169f1
parent5ae375078d981e9efb3ac6ea68572f941fc883cf (diff)
downloadraidgrep-dd46cead3d4b5aaf5731f5e5104927651f3e2b64.tar.gz
raidgrep-dd46cead3d4b5aaf5731f5e5104927651f3e2b64.tar.bz2
raidgrep-dd46cead3d4b5aaf5731f5e5104927651f3e2b64.zip
use Encounter::from_header_id
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--src/filters/log.rs3
3 files changed, 3 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 80b9646..f875817 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
[[package]]
name = "evtclib"
version = "0.4.3"
-source = "git+https://gitlab.com/dunj3/evtclib.git?rev=b6676565#b6676565c39bb6a2fe8f5f01218fe654ec4d2cb8"
+source = "git+https://gitlab.com/dunj3/evtclib.git?rev=f480faee#f480faeefbab83a4396a172a15fce7d264216ef2"
dependencies = [
"byteorder",
"getset",
diff --git a/Cargo.toml b/Cargo.toml
index df9a838..5feec30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://gitlab.com/dunj3/raidgrep"
lto = true
[dependencies]
-evtclib = { git = "https://gitlab.com/dunj3/evtclib.git", rev = "b6676565" }
+evtclib = { git = "https://gitlab.com/dunj3/evtclib.git", rev = "f480faee" }
regex = "1"
structopt = "0.3"
walkdir = "2"
diff --git a/src/filters/log.rs b/src/filters/log.rs
index bd02b21..ac166e1 100644
--- a/src/filters/log.rs
+++ b/src/filters/log.rs
@@ -12,7 +12,6 @@ use std::collections::HashSet;
use evtclib::Encounter;
use chrono::{DateTime, Datelike, Utc, Weekday};
-use num_traits::FromPrimitive as _;
/// Filter trait used for filters that operate on complete logs.
pub trait LogFilter = Filter<EarlyLogResult, LogResult>;
@@ -22,7 +21,7 @@ struct BossFilter(HashSet<Encounter>);
impl Filter<EarlyLogResult, LogResult> for BossFilter {
fn filter_early(&self, early_log: &EarlyLogResult) -> Inclusion {
- let boss = Encounter::from_u16(early_log.evtc.header.combat_id);
+ let boss = Encounter::from_header_id(early_log.evtc.header.combat_id);
boss.map(|b| self.0.contains(&b).into())
.unwrap_or(Inclusion::Exclude)
}