Skip to content

Commit c962d4a

Browse files
committed
impl fmt::Display for BasicParseErrorKind
1 parent 5b32280 commit c962d4a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/parser.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ pub enum BasicParseErrorKind<'i> {
5555
QualifiedRuleInvalid,
5656
}
5757

58-
impl<'i> BasicParseErrorKind<'i> {
59-
fn description(&self) -> String {
58+
impl<'i> fmt::Display for BasicParseErrorKind<'i> {
59+
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
6060
match self {
6161
BasicParseErrorKind::UnexpectedToken(token) => {
62-
format!("Unexpected token: {:?}", token)
62+
write!(formatter, "Unexpected token: {:?}", token)
6363
}
64-
BasicParseErrorKind::EndOfInput => "End of input".to_owned(),
65-
BasicParseErrorKind::AtRuleInvalid(message) => format!("Invalid @ rule: {}", message),
66-
BasicParseErrorKind::AtRuleBodyInvalid => "Invalid @ rule body".to_owned(),
67-
BasicParseErrorKind::QualifiedRuleInvalid => "Invalid qualified rule".to_owned(),
64+
BasicParseErrorKind::EndOfInput => formatter.write_str("End of input"),
65+
BasicParseErrorKind::AtRuleInvalid(message) => write!(formatter, "Invalid @ rule: {}", message),
66+
BasicParseErrorKind::AtRuleBodyInvalid => formatter.write_str("Invalid @ rule body"),
67+
BasicParseErrorKind::QualifiedRuleInvalid => formatter.write_str("Invalid qualified rule"),
6868
}
6969
}
7070
}
@@ -79,7 +79,7 @@ pub struct BasicParseError<'i> {
7979

8080
impl<'i> fmt::Display for BasicParseError<'i> {
8181
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
82-
formatter.write_str(self.kind.description().as_str())
82+
self.kind.fmt(formatter)
8383
}
8484
}
8585

@@ -189,7 +189,7 @@ where
189189
{
190190
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
191191
match &self.kind {
192-
ParseErrorKind::Basic(basic_kind) => formatter.write_str(&basic_kind.description()),
192+
ParseErrorKind::Basic(basic_kind) => basic_kind.fmt(formatter),
193193
ParseErrorKind::Custom(custom_type) => custom_type.fmt(formatter),
194194
}
195195
}

0 commit comments

Comments
 (0)