diff options
Diffstat (limited to 'rprt-engine/src/evaluate.rs')
| -rw-r--r-- | rprt-engine/src/evaluate.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/rprt-engine/src/evaluate.rs b/rprt-engine/src/evaluate.rs index 4f567fb..eeb1415 100644 --- a/rprt-engine/src/evaluate.rs +++ b/rprt-engine/src/evaluate.rs @@ -1,7 +1,7 @@ use crate::{ expression::{Composite, HookKind}, - selection::{Selection, SelectionError, VectoriseError}, - selection_functions::{evaluate_selection_function, SFError}, + selection::Selection, + selection_functions::{SelectionFunctionError, evaluate_selection_function}, state::{EditorState, GroupedChangeError, StateChange, StateResult}, text::Text, }; @@ -11,9 +11,7 @@ use thiserror::Error; #[derive(Error, Debug)] pub enum EvaluationError { #[error("{0}")] - SelectionFunctionError(VectoriseError<SFError>), - #[error("{0}")] - SelectionUnionError(SelectionError), + SelectionFunctionError(SelectionFunctionError), #[error("Error in processing group {0}")] GroupError(GroupedChangeError), #[error("Invalid right-only application")] @@ -152,7 +150,7 @@ fn _eval( } .map_err(EvaluationError::GroupError)?; - let sel = Selection::union(selections).map_err(EvaluationError::SelectionUnionError)?; + let sel = Selection::union(selections); Ok((sel, states)) } } |
