clean up after review

Author: TheAnyKey

parser/src/fstring.rs

@@ -34,26 +34,22 @@ impl<'a> FStringParser<'a> {
                 // can be integrated better with the remainign code, but as a starting point ok
                 // in general I would do here a tokenizing of the fstrings to omit this peeking.
                 '!' if self.chars.peek() == Some(&'=') => {
-                    expression.push('!');
-                    expression.push('=');
+                    expression.push_str("!=");
                     self.chars.next();
                 }
 
                 '=' if self.chars.peek() == Some(&'=') => {
-                    expression.push('=');
-                    expression.push('=');
+                    expression.push_str("==");
                     self.chars.next();
                 }
 
                 '>' if self.chars.peek() == Some(&'=') => {
-                    expression.push('>');
-                    expression.push('=');
+                    expression.push_str(">=");
                     self.chars.next();
                 }
 
                 '<' if self.chars.peek() == Some(&'=') => {
-                    expression.push('<');
-                    expression.push('=');
+                    expression.push_str("<=");
                     self.chars.next();
                 }
 
@@ -74,8 +70,11 @@ impl<'a> FStringParser<'a> {
                         }
                     });
 
-                    let peek = self.chars.peek();
-                    if peek != Some(&'}') && peek != Some(&':') {
+                    if let Some(&peek) = self.chars.peek() {
+                        if peek != '}' && peek != ':' {
+                            return Err(ExpectedRbrace);
+                        }
+                    } else {
                         return Err(ExpectedRbrace);
                     }
                 }
@@ -197,17 +196,14 @@ impl<'a> FStringParser<'a> {
                         }
                     }
                 }
-
                 ' ' if !pred_expression_text.is_empty() => {
                     trailing_seq.push(ch);
                 }
-
                 _ => {
                     expression.push(ch);
                 }
             }
         }
-
         Err(UnclosedLbrace)
     }
 
@@ -391,7 +387,6 @@ mod tests {
 
         assert_eq!(parse_fstring("{5!a1}"), Err(ExpectedRbrace));
         assert_eq!(parse_fstring("{5!"), Err(ExpectedRbrace));
-
         assert_eq!(parse_fstring("abc{!a 'cat'}"), Err(EmptyExpression));
         assert_eq!(parse_fstring("{!a"), Err(EmptyExpression));
         assert_eq!(parse_fstring("{ !a}"), Err(EmptyExpression));