update parsers to use the ParserIter trait from mon

2 files changed, 35 insertions, 18 deletions

diff --git a/src/ebuild/parsers.rs b/src/ebuild/parsers.rs
index 56b86ba..f685df3 100644
--- a/src/ebuild/parsers.rs
+++ b/src/ebuild/parsers.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use mon::{Parser, alpha1, r#if, tag, whitespace1};
+use mon::{Parser, ParserIter, alpha1, r#if, tag, whitespace1};
 
 use crate::{
     Parseable,
@@ -26,7 +26,8 @@ impl<'a> Parseable<'a, &'a str> for Uri {
             .followed_by(tag("://"))
             .map(|output: &str| output.to_string());
         let path = r#if(|c: &char| !c.is_ascii_whitespace())
-            .repeated(1..)
+            .repeated()
+            .at_least(1)
             .recognize()
             .map(|output: &str| output.to_string());
 
@@ -42,7 +43,8 @@ impl<'a> Parseable<'a, &'a str> for SrcUri {
     fn parser() -> Self::Parser {
         let filename = || {
             r#if(|c: &char| !c.is_ascii_whitespace())
-                .repeated(1..)
+                .repeated()
+                .at_least(1)
                 .recognize()
                 .map(|output: &str| PathBuf::from(output))
         };
@@ -65,7 +67,9 @@ impl<'a> Parseable<'a, &'a str> for License {
 
     fn parser() -> Self::Parser {
         let start = r#if(|c: &char| c.is_ascii_alphanumeric() || "_".contains(*c));
-        let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).repeated(0..);
+        let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c))
+            .repeated()
+            .many();
 
         start
             .and(rest)
@@ -79,7 +83,9 @@ impl<'a> Parseable<'a, &'a str> for Eapi {
 
     fn parser() -> Self::Parser {
         let start = r#if(|c: &char| c.is_ascii_alphanumeric() || "_".contains(*c));
-        let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).repeated(0..);
+        let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c))
+            .repeated()
+            .many();
 
         start
             .and(rest)
@@ -96,7 +102,8 @@ impl<'a> Parseable<'a, &'a str> for Eclass {
 
     fn parser() -> Self::Parser {
         r#if(|c: &char| !c.is_ascii_whitespace())
-            .repeated(1..)
+            .repeated()
+            .at_least(1)
             .recognize()
             .map(|output: &str| Eclass(output.to_string()))
     }
@@ -111,18 +118,21 @@ where
     fn parser() -> Self::Parser {
         |it| {
             let all_of_group = Depend::parser()
-                .separated_by(whitespace1(), 1..)
+                .separated_by(whitespace1())
+                .at_least(1)
                 .delimited_by(tag("(").followed_by(whitespace1()), tag(")"))
                 .map(|exprs| Depend::AllOf(exprs));
 
             let any_of_group = Depend::parser()
-                .separated_by(whitespace1(), 1..)
+                .separated_by(whitespace1())
+                .at_least(1)
                 .delimited_by(tag("(").followed_by(whitespace1()), tag(")"))
                 .preceded_by(tag("||").followed_by(whitespace1()))
                 .map(|exprs| Depend::AnyOf(exprs));
 
             let one_of_group = Depend::parser()
-                .separated_by(whitespace1(), 1..)
+                .separated_by(whitespace1())
+                .at_least(1)
                 .delimited_by(tag("(").followed_by(whitespace1()), tag(")"))
                 .preceded_by(tag("^^").followed_by(whitespace1()))
                 .map(|exprs| Depend::OneOf(exprs));
@@ -131,7 +141,8 @@ where
                 .followed_by(whitespace1())
                 .and(
                     Depend::parser()
-                        .separated_by(whitespace1(), 1..)
+                        .separated_by(whitespace1())
+                        .at_least(1)
                         .delimited_by(tag("(").followed_by(whitespace1()), tag(")")),
                 )
                 .map(|(conditional, exprs)| Depend::ConditionalGroup(conditional, exprs));
@@ -164,7 +175,7 @@ impl<'a> Parseable<'a, &'a str> for Conditional {
 #[cfg(test)]
 mod test {
 
-    use mon::input::InputIter;
+    use mon::{ParserIter, input::InputIter};
 
     use crate::{atom::Atom, ebuild::Depend};
 
@@ -189,7 +200,8 @@ mod test {
         let it = InputIter::new("flag? ( || ( foo/bar foo/bar ) )");
 
         Depend::<Atom>::parser()
-            .separated_by(whitespace1(), 0..)
+            .separated_by(whitespace1())
+            .many()
             .check_finished(it)
             .unwrap();
     }
diff --git a/src/ebuild/repo/mod.rs b/src/ebuild/repo/mod.rs
index 46d43ac..53ad6f7 100644
--- a/src/ebuild/repo/mod.rs
+++ b/src/ebuild/repo/mod.rs
@@ -5,7 +5,7 @@ use std::{
 
 use get::Get;
 
-use mon::{Parser, input::InputIter, tag, whitespace1};
+use mon::{Parser, ParserIter, input::InputIter, tag, whitespace1};
 
 use crate::{
     Parseable,
@@ -200,7 +200,8 @@ fn read_src_uri(input: &str) -> Option<Result<Vec<Depend<SrcUri>>, Error>> {
         .find_map(|line| line.strip_prefix("SRC_URI="))?;
 
     match Depend::<SrcUri>::parser()
-        .separated_by(whitespace1(), 0..)
+        .separated_by(whitespace1())
+        .many()
         .parse_finished(InputIter::new(line))
     {
         Ok(slot) => Some(Ok(slot)),
@@ -223,7 +224,8 @@ fn read_inherit(input: &str) -> Option<Result<Vec<Eclass>, Error>> {
         .find_map(|line| line.strip_prefix("INHERIT="))?;
 
     match Eclass::parser()
-        .separated_by(whitespace1(), 0..)
+        .separated_by(whitespace1())
+        .many()
         .parse_finished(InputIter::new(line))
     {
         Ok(inherit) => Some(Ok(inherit)),
@@ -235,7 +237,8 @@ fn read_iuse(input: &str) -> Option<Result<Vec<IUseFlag>, Error>> {
     let line = input.lines().find_map(|line| line.strip_prefix("IUSE="))?;
 
     match IUseFlag::parser()
-        .separated_by(whitespace1(), 0..)
+        .separated_by(whitespace1())
+        .many()
         .parse_finished(InputIter::new(line))
     {
         Ok(iuse) => Some(Ok(iuse)),
@@ -249,7 +252,8 @@ fn read_license(input: &str) -> Option<Result<Vec<Depend<License>>, Error>> {
         .find_map(|line| line.strip_suffix("LICENSE="))?;
 
     match Depend::<License>::parser()
-        .separated_by(whitespace1(), 0..)
+        .separated_by(whitespace1())
+        .many()
         .parse_finished(InputIter::new(line))
     {
         Ok(license) => Some(Ok(license)),
@@ -297,7 +301,8 @@ fn read_idepend(input: &str) -> Option<Result<Vec<Depend<Atom>>, Error>> {
 
 fn parse_depends(line: &str) -> Result<Vec<Depend<Atom>>, Error> {
     Depend::<Atom>::parser()
-        .separated_by(whitespace1(), 0..)
+        .separated_by(whitespace1())
+        .many()
         .parse_finished(InputIter::new(line))
         .map_err(|_| Error::Parser(line.to_string()))
 }