@@ -55,16 +55,16 @@ pub enum BasicParseErrorKind<'i> {
55
55
QualifiedRuleInvalid ,
56
56
}
57
57
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 {
60
60
match self {
61
61
BasicParseErrorKind :: UnexpectedToken ( token) => {
62
- format ! ( "Unexpected token: {:?}" , token)
62
+ write ! ( formatter , "Unexpected token: {:?}" , token)
63
63
}
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" ) ,
68
68
}
69
69
}
70
70
}
@@ -79,7 +79,7 @@ pub struct BasicParseError<'i> {
79
79
80
80
impl < ' i > fmt:: Display for BasicParseError < ' i > {
81
81
fn fmt ( & self , formatter : & mut fmt:: Formatter ) -> fmt:: Result {
82
- formatter . write_str ( self . kind . description ( ) . as_str ( ) )
82
+ self . kind . fmt ( formatter )
83
83
}
84
84
}
85
85
@@ -189,7 +189,7 @@ where
189
189
{
190
190
fn fmt ( & self , formatter : & mut fmt:: Formatter ) -> fmt:: Result {
191
191
match & self . kind {
192
- ParseErrorKind :: Basic ( basic_kind) => formatter . write_str ( & basic_kind. description ( ) ) ,
192
+ ParseErrorKind :: Basic ( basic_kind) => basic_kind. fmt ( formatter ) ,
193
193
ParseErrorKind :: Custom ( custom_type) => custom_type. fmt ( formatter) ,
194
194
}
195
195
}
0 commit comments