Skip to content

Commit 6480619

Browse files
authored
Merge pull request RustPython#4402 from harupy/remove-unreachable-if
Remove unreachable code in `compiler/parser/src/string_parser.rs`
2 parents 4d53c7c + 0df1c9f commit 6480619

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

compiler/parser/src/string_parser.rs

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -219,35 +219,18 @@ impl<'a> StringParser<'a> {
219219
Some('a') => ConversionFlag::Ascii,
220220
Some('r') => ConversionFlag::Repr,
221221
Some(_) => {
222-
return Err(if expression.trim().is_empty() {
223-
EmptyExpression.to_lexical_error(self.get_pos())
224-
} else {
225-
InvalidConversionFlag.to_lexical_error(self.get_pos())
226-
});
222+
return Err(InvalidConversionFlag.to_lexical_error(self.get_pos()));
227223
}
228224
None => {
229-
return Err(if expression.trim().is_empty() {
230-
EmptyExpression.to_lexical_error(self.get_pos())
231-
} else {
232-
UnclosedLbrace.to_lexical_error(self.get_pos())
233-
});
225+
return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
234226
}
235227
};
236228

237-
if let Some(&peek) = self.peek() {
238-
if peek != '}' && peek != ':' {
239-
return Err(if expression.trim().is_empty() {
240-
EmptyExpression.to_lexical_error(self.get_pos())
241-
} else {
242-
UnclosedLbrace.to_lexical_error(self.get_pos())
243-
});
229+
match self.peek() {
230+
Some('}' | ':') => {}
231+
Some(_) | None => {
232+
return Err(UnclosedLbrace.to_lexical_error(self.get_pos()))
244233
}
245-
} else {
246-
return Err(if expression.trim().is_empty() {
247-
EmptyExpression.to_lexical_error(self.get_pos())
248-
} else {
249-
UnclosedLbrace.to_lexical_error(self.get_pos())
250-
});
251234
}
252235
}
253236

0 commit comments

Comments
 (0)