From 3b74e780ecc2f5cd41b10460600317fecb9bc8e8 Mon Sep 17 00:00:00 2001 From: philippeitis <33013301+philippeitis@users.noreply.github.com> Date: Wed, 26 Feb 2020 21:07:46 -0800 Subject: [PATCH] Add ExpectedRbrace error, fix error messages. --- parser/src/error.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parser/src/error.rs b/parser/src/error.rs index 6afc4627b2..6a8c0340ce 100644 --- a/parser/src/error.rs +++ b/parser/src/error.rs @@ -81,6 +81,7 @@ pub struct FStringError { pub enum FStringErrorType { UnclosedLbrace, UnopenedRbrace, + ExpectedRbrace, InvalidExpression(Box), InvalidConversionFlag, EmptyExpression, @@ -91,8 +92,9 @@ pub enum FStringErrorType { impl fmt::Display for FStringErrorType { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - FStringErrorType::UnclosedLbrace => write!(f, "Unclosed '('"), - FStringErrorType::UnopenedRbrace => write!(f, "Unopened ')'"), + FStringErrorType::UnclosedLbrace => write!(f, "Unclosed '{{'"), + FStringErrorType::UnopenedRbrace => write!(f, "Unopened '}}'"), + FStringErrorType::ExpectedRbrace => write!(f, "Expected '}}' after conversion flag."), FStringErrorType::InvalidExpression(error) => { write!(f, "Invalid expression: {}", error) }