From 5ae375078d981e9efb3ac6ea68572f941fc883cf Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
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/fexpr/grammar.lalrpop | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/fexpr')

diff --git a/src/fexpr/grammar.lalrpop b/src/fexpr/grammar.lalrpop
index 092407e..6333783 100644
--- a/src/fexpr/grammar.lalrpop
+++ b/src/fexpr/grammar.lalrpop
@@ -9,7 +9,7 @@ use super::{
     DurationProducer,
     CountProducer,
 };
-use evtclib::Boss;
+use evtclib::Encounter;
 use std::collections::HashSet;
 use lalrpop_util::ParseError;
 
@@ -61,7 +61,7 @@ LogPredicate: Box<dyn filters::log::LogFilter> = {
     "-log-before" <Date> => filters::log::log_before(<>),
     "-log-after" <Date> => filters::log::log_after(<>),
 
-    "-boss" <Comma<Boss>> => filters::log::boss(<>),
+    "-boss" <Comma<Encounter>> => filters::log::encounter(<>),
     "-cm" => filters::log::challenge_mote(),
 
     "-include" => filters::constant(true),
@@ -138,7 +138,7 @@ Weekday: Weekday = {
     }),
 }
 
-Boss: Boss = {
+Encounter: Encounter = {
     <l:@L> <w:word> =>? w.parse().map_err(|_| ParseError::User {
         error: FError {
             location: l,
-- 
cgit v1.2.3