diff options
Diffstat (limited to 'mingling/src/parser')
| -rw-r--r-- | mingling/src/parser/args.rs | 12 | ||||
| -rw-r--r-- | mingling/src/parser/picker/builtin.rs | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mingling/src/parser/args.rs b/mingling/src/parser/args.rs index f795b54..2a07e97 100644 --- a/mingling/src/parser/args.rs +++ b/mingling/src/parser/args.rs @@ -72,12 +72,12 @@ impl Argument { where F: Into<Flag>, { - if self.len() < 1 { + if self.is_empty() { return None; } let flag: Flag = flag.into(); - if flag.len() > 0 { + if !flag.is_empty() { // Has any flag for argument in flag.iter() { let value = special_argument!(self.vec, argument); @@ -99,12 +99,12 @@ impl Argument { { let mut str_result = Vec::new(); - if self.len() < 1 { + if self.is_empty() { return str_result; } let flag: Flag = flag.into(); - if flag.len() < 1 { + if flag.is_empty() { let value = special_arguments!(self.vec, ""); str_result.extend(value); } else { @@ -122,12 +122,12 @@ impl Argument { where F: Into<Flag>, { - if self.len() < 1 { + if self.is_empty() { return false; } let flag: Flag = flag.into(); - if flag.len() > 0 { + if !flag.is_empty() { // Has any flag for argument in flag.iter() { let enabled = special_flag!(self.vec, argument); diff --git a/mingling/src/parser/picker/builtin.rs b/mingling/src/parser/picker/builtin.rs index 8a10dfc..9fbbfd1 100644 --- a/mingling/src/parser/picker/builtin.rs +++ b/mingling/src/parser/picker/builtin.rs @@ -25,9 +25,7 @@ macro_rules! impl_pickable_for_number { type Output = $t; fn pick(args: &mut crate::parser::Argument, flag: mingling_core::Flag) -> Option<Self::Output> { - let Some(picked) = args.pick_argument(flag) else { - return None; - }; + let picked = args.pick_argument(flag)?; picked.parse().ok() } } @@ -66,9 +64,7 @@ impl Pickable for usize { type Output = usize; fn pick(args: &mut crate::parser::Argument, flag: mingling_core::Flag) -> Option<Self::Output> { - let Some(picked) = args.pick_argument(flag) else { - return None; - }; + let picked = args.pick_argument(flag)?; let size_parse = Size::from_str(picked.as_str()); match size_parse { Ok(size) => Some(size.bytes() as usize), |
