From 331d6b1762d1d9431b210fc98a495d56ad7a1cd1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 13 May 2020 12:52:13 +0200 Subject: clean up SearchField related code With the addition of our own parser, we no longer need the FromStr implementation for SearchField. Furthermore, it is now only used in player::NameFilter, so the definition has been moved there. The import in the grammar was unused as well, so it has been removed. --- src/fexpr/grammar.lalrpop | 1 - src/fexpr/mod.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/fexpr') diff --git a/src/fexpr/grammar.lalrpop b/src/fexpr/grammar.lalrpop index 6a7a9a0..45f4fde 100644 --- a/src/fexpr/grammar.lalrpop +++ b/src/fexpr/grammar.lalrpop @@ -4,7 +4,6 @@ use super::{ FightOutcome, filters, PlayerClass, - SearchField, }; use evtclib::Boss; use std::collections::HashSet; diff --git a/src/fexpr/mod.rs b/src/fexpr/mod.rs index 452d66c..c6a3a39 100644 --- a/src/fexpr/mod.rs +++ b/src/fexpr/mod.rs @@ -3,7 +3,7 @@ //! This module contains methods to parse a given string into an abstract filter tree, check its //! type and convert it to a [`Filter`][super::filters::Filter]. // Make it available in the grammar mod. -use super::{filters, playerclass::PlayerClass, FightOutcome, SearchField}; +use super::{filters, playerclass::PlayerClass, FightOutcome}; use std::{error, fmt}; -- cgit v1.2.3