From 804c8fd0b752cf24006f95e662db0d28d8140d88 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 17 Jul 2022 18:19:03 -0400 Subject: [PATCH] Cleaner implementation. --- src/parser/nom_context.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/parser/nom_context.rs b/src/parser/nom_context.rs index 65a9e9a..e62d73f 100644 --- a/src/parser/nom_context.rs +++ b/src/parser/nom_context.rs @@ -43,7 +43,7 @@ where pub fn with_additional_fail_matcher( self, - additional_fail_matcher: G, + mut additional_fail_matcher: G, ) -> NomContext< impl Clone + for<'o> FnMut(&'o str) -> IResult<&'o str, &'o str, VerboseError<&'o str>>, > @@ -52,16 +52,12 @@ where G: Clone, { let mut old_fail_matcher_clone = self.fail_matcher.clone(); - let mut new_context = - NomContext::new(move |i| alt((recognize(bold_end), &mut old_fail_matcher_clone))(i)); - new_context.can_match_bold = self.can_match_bold; - new_context.can_match_link = self.can_match_link; - - // NomContext { - // fail_matcher: move |i| alt((additional_fail_matcher, &mut old_fail_matcher_clone))(i), - // can_match_bold: self.can_match_bold, - // can_match_link: self.can_match_link, - // } - new_context + NomContext { + fail_matcher: move |i| { + alt((&mut additional_fail_matcher, &mut old_fail_matcher_clone))(i) + }, + can_match_bold: self.can_match_bold, + can_match_link: self.can_match_link, + } } }