Merge pull request #4402 from harupy/remove-unreachable-if

Remove unreachable code in `compiler/parser/src/string_parser.rs`
This commit is contained in:
Jim Fasarakis-Hilliard 2023-01-02 17:05:45 +02:00 committed by GitHub
commit d691527ead

View file

@ -219,35 +219,18 @@ impl<'a> StringParser<'a> {
Some('a') => ConversionFlag::Ascii, Some('a') => ConversionFlag::Ascii,
Some('r') => ConversionFlag::Repr, Some('r') => ConversionFlag::Repr,
Some(_) => { Some(_) => {
return Err(if expression.trim().is_empty() { return Err(InvalidConversionFlag.to_lexical_error(self.get_pos()));
EmptyExpression.to_lexical_error(self.get_pos())
} else {
InvalidConversionFlag.to_lexical_error(self.get_pos())
});
} }
None => { None => {
return Err(if expression.trim().is_empty() { return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
EmptyExpression.to_lexical_error(self.get_pos())
} else {
UnclosedLbrace.to_lexical_error(self.get_pos())
});
} }
}; };
if let Some(&peek) = self.peek() { match self.peek() {
if peek != '}' && peek != ':' { Some('}' | ':') => {}
return Err(if expression.trim().is_empty() { Some(_) | None => {
EmptyExpression.to_lexical_error(self.get_pos()) return Err(UnclosedLbrace.to_lexical_error(self.get_pos()))
} else {
UnclosedLbrace.to_lexical_error(self.get_pos())
});
} }
} else {
return Err(if expression.trim().is_empty() {
EmptyExpression.to_lexical_error(self.get_pos())
} else {
UnclosedLbrace.to_lexical_error(self.get_pos())
});
} }
} }