diff options
Diffstat (limited to 'src/token.rs')
-rw-r--r-- | src/token.rs | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/token.rs b/src/token.rs index f5696e7..76cd7b4 100644 --- a/src/token.rs +++ b/src/token.rs @@ -49,10 +49,7 @@ pub struct TokenParser<'a> { impl<'a> TokenParser<'a> { pub fn new(input: &'a str, patterns: &'a TokenPatterns) -> Self { - Self { - input, - patterns, - } + Self { input, patterns } } pub fn parse(&mut self) -> Token { @@ -76,7 +73,7 @@ impl<'a> TokenParser<'a> { Token::Pipe } else if self.literal("=") { Token::Equals - } else if let Some(m) = self.regex(&self.patterns.spaces.clone()) { + } else if let Some(m) = self.regex(&self.patterns.spaces.clone()) { Token::Spaces(m.as_str().into()) } else if let Some(m) = self.regex(&self.patterns.triple_quoted.clone()) { Token::QuotedValue(m.as_str().into()) @@ -160,7 +157,6 @@ mod test { assert_eq!(p.parse(), Token::End); } - #[test] fn single_open_bracket() { let patterns = TokenPatterns::default(); @@ -265,10 +261,7 @@ mod test { #[test] fn simple_directive() { let patterns = TokenPatterns::default(); - let mut p = parser( - r#"[[!if test="enabled(sidebar)"]]"#, - &patterns - ); + let mut p = parser(r#"[[!if test="enabled(sidebar)"]]"#, &patterns); assert_eq!(p.parse(), Token::OpenBrackets); assert_eq!(p.parse(), Token::Bang); assert_eq!(p.parse(), Token::Word("if".into())); @@ -291,7 +284,7 @@ mod test { """ else=""" [[!inline pages=sidebar raw=yes]] """]]"#, - &patterns + &patterns, ); assert_eq!(p.parse(), Token::OpenBrackets); assert_eq!(p.parse(), Token::Bang); @@ -310,7 +303,10 @@ mod test { assert_eq!(p.parse(), Token::Spaces(" ".into())); assert_eq!(p.parse(), Token::Word("else".into())); assert_eq!(p.parse(), Token::Equals); - assert_eq!(p.parse(), Token::QuotedValue("\n[[!inline pages=sidebar raw=yes]]\n".into())); + assert_eq!( + p.parse(), + Token::QuotedValue("\n[[!inline pages=sidebar raw=yes]]\n".into()) + ); assert_eq!(p.parse(), Token::CloseBrackets); assert_eq!(p.parse(), Token::End); @@ -325,7 +321,7 @@ mod test { """ else=""" [[!inline pages=sidebar raw=yes]] """]]"#, - &patterns + &patterns, ); let mut p = orig.clone(); assert_eq!(p.parse(), Token::OpenBrackets); @@ -345,7 +341,10 @@ mod test { assert_eq!(p.parse(), Token::Spaces(" ".into())); assert_eq!(p.parse(), Token::Word("else".into())); assert_eq!(p.parse(), Token::Equals); - assert_eq!(p.parse(), Token::QuotedValue("\n[[!inline pages=sidebar raw=yes]]\n".into())); + assert_eq!( + p.parse(), + Token::QuotedValue("\n[[!inline pages=sidebar raw=yes]]\n".into()) + ); assert_eq!(p.parse(), Token::CloseBrackets); assert_eq!(p.parse(), Token::End); |