From 7ba450f984d0f7839f4d081b89529c624f61e96f Mon Sep 17 00:00:00 2001 From: Marty B Date: Fri, 24 Jan 2020 05:59:15 +0100 Subject: [PATCH 1/2] Add Debug trait to MatchOptions --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 48f789d..528655e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -967,7 +967,7 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool { /// Configuration options to modify the behaviour of `Pattern::matches_with(..)`. #[allow(missing_copy_implementations)] -#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] +#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] pub struct MatchOptions { /// Whether or not patterns should be matched in a case-sensitive manner. /// This currently only considers upper/lower case relationships between From bf155d4a0a9d4f1548fa0e01160d21789eef475c Mon Sep 17 00:00:00 2001 From: Martin Bammer Date: Mon, 27 Jan 2020 09:37:45 +0100 Subject: [PATCH 2/2] Move tokens_len --- src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 528655e..c1398e2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -594,11 +594,12 @@ impl Pattern { }); }; - let tokens_len = tokens.len(); - if is_valid { // collapse consecutive AnyRecursiveSequence to a // single one + + let tokens_len = tokens.len(); + if !(tokens_len > 1 && tokens[tokens_len - 1] == AnyRecursiveSequence) { is_recursive = true; tokens.push(AnyRecursiveSequence);