optimize code

baoyachi · May 10, 2024 · 58a0af4 · 58a0af4
1 parent b104c55
commit 58a0af4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -247,6 +247,10 @@ impl CondUnit {
         (CondUnit::Star, ONE_SECOND_NANOSECOND)
     }
 
+    fn contain(c: char) -> bool {
+        Self::expect_val().contains(&&*c.to_string())
+    }
+
     fn change_duration(&self) -> u64 {
         match self {
             CondUnit::Plus => 0,

diff --git a/src/unit.rs b/src/unit.rs
@@ -1,6 +1,6 @@
 use crate::error::PError;
 use crate::{
-    DError, DResult, ExpectErr, ONE_DAY_NANOSECOND, ONE_HOUR_NANOSECOND,
+    CondUnit, DError, DResult, ExpectErr, ONE_DAY_NANOSECOND, ONE_HOUR_NANOSECOND,
     ONE_MICROSECOND_NANOSECOND, ONE_MILLISECOND_NANOSECOND, ONE_MINUTE_NANOSECOND,
     ONE_MONTH_NANOSECOND, ONE_SECOND_NANOSECOND, ONE_WEEK_NANOSECOND, ONE_YEAR_NANOSECOND,
 };
@@ -112,7 +112,7 @@ pub(crate) fn opt_unit_abbr<'a>(input: &mut &'a str) -> PResult<TimeUnit, PError
             return Ok(TimeUnit::default());
         }
 
-        if peek((multispace, one_of(|c| c == '+' || c == '*')))
+        if peek((multispace, one_of(CondUnit::contain)))
             .parse_next(input)
             .is_ok()
         {