From 690f59c44c6b121ba8330a35f50432910332c4b0 Mon Sep 17 00:00:00 2001 From: Dhruv Manilawala Date: Tue, 5 Sep 2023 09:21:36 +0530 Subject: [PATCH] Remove unused error type, fix test case --- crates/ruff_python_parser/src/string.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/ruff_python_parser/src/string.rs b/crates/ruff_python_parser/src/string.rs index 6645272884ac13..9d6e9fc7f3809f 100644 --- a/crates/ruff_python_parser/src/string.rs +++ b/crates/ruff_python_parser/src/string.rs @@ -473,8 +473,6 @@ pub enum FStringErrorType { UnclosedLbrace, /// An invalid conversion flag was encountered. InvalidConversionFlag, - /// An empty expression was encountered. - EmptyExpression, /// A single right brace was encountered. SingleRbrace, /// Unterminated string. @@ -486,13 +484,12 @@ pub enum FStringErrorType { impl std::fmt::Display for FStringErrorType { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { use FStringErrorType::{ - EmptyExpression, InvalidConversionFlag, SingleRbrace, UnclosedLbrace, - UnterminatedString, UnterminatedTripleQuotedString, + InvalidConversionFlag, SingleRbrace, UnclosedLbrace, UnterminatedString, + UnterminatedTripleQuotedString, }; match self { UnclosedLbrace => write!(f, "expecting '}}'"), InvalidConversionFlag => write!(f, "invalid conversion character"), - EmptyExpression => write!(f, "empty expression not allowed"), SingleRbrace => write!(f, "single '}}' is not allowed"), UnterminatedString => write!(f, "unterminated string"), UnterminatedTripleQuotedString => write!(f, "unterminated triple-quoted string"), @@ -586,9 +583,7 @@ mod tests { use FStringErrorType::InvalidConversionFlag; assert_eq!(parse_fstring_error(r#"f"{5!x}""#), InvalidConversionFlag); - - // TODO: check for InvalidExpression enum? - assert!(parse_suite("{class}", "").is_err()); + assert!(parse_suite(r#"f"{class}""#, "").is_err()); } #[test]