From 5ae375078d981e9efb3ac6ea68572f941fc883cf Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 4 Oct 2020 11:48:26 +0200 Subject: update to newest evtclib There's a good chance that this will be evtclib 0.5, so we want to adapt our API usage (mainly replacing evtclib::Boss with evtclib::Encounter). The naming is a bit all over the place now, as we sometimes refer to bosses and sometimes to encounters, but I hope to make a sensible decision at *some point* about what we're actually doing here. --- src/output/formats.rs | 2 +- src/output/sorting.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/output') diff --git a/src/output/formats.rs b/src/output/formats.rs index 560963b..7225da2 100644 --- a/src/output/formats.rs +++ b/src/output/formats.rs @@ -42,7 +42,7 @@ impl Format for HumanReadable { .with_timezone(&Local) .format("%Y-%m-%d %H:%M:%S %a"), "Boss".green(), - item.boss + item.encounter .map(|x| x.to_string()) .unwrap_or_else(|| "unknown".into()), if item.is_cm { " CM" } else { "" }, diff --git a/src/output/sorting.rs b/src/output/sorting.rs index 2a0821c..628a1a8 100644 --- a/src/output/sorting.rs +++ b/src/output/sorting.rs @@ -68,7 +68,7 @@ impl Display for Component { } fn boss_id(log: &LogResult) -> u32 { - log.boss.map(|x| x as u32).unwrap_or(0) + log.encounter.map(|x| x as u32).unwrap_or(0) } impl Component { -- cgit v1.2.3