Merge pull request #4404 from harupy/merge-match-arms

Merge match arms in `StringParser.parse_formatted_value`
This commit is contained in:
Jim Fasarakis-Hilliard 2023-01-02 18:18:40 +02:00 committed by GitHub
commit 69c012b8c5

View file

@ -189,26 +189,11 @@ impl<'a> StringParser<'a> {
match ch {
// can be integrated better with the remaining code, but as a starting point ok
// in general I would do here a tokenizing of the fstrings to omit this peeking.
'!' if self.peek() == Some(&'=') => {
expression.push_str("!=");
'!' | '=' | '>' | '<' if self.peek() == Some(&'=') => {
expression.push(ch);
expression.push('=');
self.next_char();
}
'=' if self.peek() == Some(&'=') => {
expression.push_str("==");
self.next_char();
}
'>' if self.peek() == Some(&'=') => {
expression.push_str(">=");
self.next_char();
}
'<' if self.peek() == Some(&'=') => {
expression.push_str("<=");
self.next_char();
}
'!' if delims.is_empty() && self.peek() != Some(&'=') => {
if expression.trim().is_empty() {
return Err(EmptyExpression.to_lexical_error(self.get_pos()));