diff options
Diffstat (limited to 'src/atom')
| -rw-r--r-- | src/atom/parsers.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/atom/parsers.rs b/src/atom/parsers.rs index 35df5f8..c2f812f 100644 --- a/src/atom/parsers.rs +++ b/src/atom/parsers.rs @@ -74,8 +74,8 @@ impl<'a> Parseable<'a, &'a str> for Version { type Parser = impl Parser<&'a str, Output = Self>; fn parser() -> Self::Parser { - let numbers = VersionNumber::parser().separated_list(tag("."), 1..); - let suffixes = VersionSuffix::parser().separated_list(tag("_"), 0..); + let numbers = VersionNumber::parser().separated_by(tag("."), 1..); + let suffixes = VersionSuffix::parser().separated_by(tag("_"), 0..); let rev = VersionNumber::parser().preceded_by(tag("-r")); numbers @@ -96,7 +96,7 @@ impl<'a> Parseable<'a, &'a str> for Category { fn parser() -> Self::Parser { let start = r#if(|c: &char| c.is_ascii_alphanumeric() || *c == '_'); - let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).list(0..); + let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).repeated(0..); start .and(rest) @@ -116,7 +116,7 @@ impl<'a> Parseable<'a, &'a str> for Name { r#if(|c: &char| c.is_ascii_alphanumeric() || "_+-".contains(*c)).not(), )), ) - .list(0..); + .repeated(0..); start .and(rest) @@ -140,7 +140,7 @@ impl<'a> Parseable<'a, &'a str> for SlotName { fn parser() -> Self::Parser { let start = r#if(|c: &char| c.is_ascii_alphanumeric() || *c == '_'); - let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).list(0..); + let rest = r#if(|c: &char| c.is_ascii_alphanumeric() || "+_.-".contains(*c)).repeated(0..); start .and(rest) @@ -257,7 +257,7 @@ impl<'a> Parseable<'a, &'a str> for Atom { .and(Slot::parser().preceded_by(tag(":")).opt()) .and( UseDep::parser() - .separated_list(tag(","), 0..) + .separated_by(tag(","), 0..) .delimited_by(tag("["), tag("]")) .opt(), ) |