diff options
author | Joris | 2025-02-07 11:25:27 +0100 |
---|---|---|
committer | Joris | 2025-02-07 11:25:27 +0100 |
commit | b24dda856ddc1317816f6ab156096528e23d724c (patch) | |
tree | 8c2737b482b8871d6f36a44f4c5c73e66f6cbc82 /src | |
parent | 49c924415e98e78b2ea5a18e0d2777a571fb3ac9 (diff) |
Fix clippy warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/parser.rs | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/parser.rs b/src/parser.rs index 62df908..09b3121 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -29,33 +29,28 @@ fn parse_parts(s: &str) -> IResult<&str, Line> { // Rest fn parse_options(s: &str) -> IResult<&str, Vec<String>> { - Ok(separated_list1(sep('|'), parse_term)(s)?) + separated_list1(sep('|'), parse_term)(s) } pub fn parse_term(s: &str) -> IResult<&str, String> { let mut term = String::from(""); let mut s = s; - loop { - match peek(take::<usize, &str, ()>(1 as usize))(s) { - Ok((_, c)) => { - if c == "[" { - let (s1, cs) = take_until("]")(s)?; - s = s1; - term.push_str(cs); - } else if c == "(" { - let (s1, cs) = take_until(")")(s)?; - s = s1; - term.push_str(cs); - } else if c == ":" || c == "|" || c == "#" || c == "\n" || c == "\r" { - break; - } else { - let (s1, cs) = is_not("[(:|#\n\r")(s)?; - s = s1; - term.push_str(cs); - } - } - _ => break, + while let Ok((_, c)) = peek(take::<usize, &str, ()>(1_usize))(s) { + if c == "[" { + let (s1, cs) = take_until("]")(s)?; + s = s1; + term.push_str(cs); + } else if c == "(" { + let (s1, cs) = take_until(")")(s)?; + s = s1; + term.push_str(cs); + } else if c == ":" || c == "|" || c == "#" || c == "\n" || c == "\r" { + break; + } else { + let (s1, cs) = is_not("[(:|#\n\r")(s)?; + s = s1; + term.push_str(cs); } } |