Skip to content

Continuation PR for #256: Implement std::error::Error for errors #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Continuation PR for #256: Implement std::error::Error for errors #262

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff679e1
Implement std::error::Error for errors
KamilaBorowska Aug 9, 2019
a1f9e6d
improve the error implementation
Oct 19, 2019
51312ea
Add best effort error descriptions
Oct 21, 2019
e985dba
Merge remote-tracking branch 'source/master' into implement-std-error
Oct 21, 2019
47d1915
Fix a EOL and cargo fmt
Oct 21, 2019
9b27f02
Merge branch 'master' into implement-std-error
Oct 23, 2019
e9a2a9b
Merge remote-tracking branch 'original/master' into implement-std-error
Apr 27, 2020
9b2246c
Process CR and simplyly the PR
Apr 27, 2020
5b32280
Merge branch 'master' into implement-std-error
Feb 2, 2022
c962d4a
impl fmt::Display for BasicParseErrorKind
categulario Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
impl fmt::Display for BasicParseErrorKind
  • Loading branch information
@categulario
categulario committed Feb 2, 2022
commit c962d4a32b9dc3efd71bc4e1a41dbcbe5c606a76
18 changes: 9 additions & 9 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ pub enum BasicParseErrorKind<'i> {
QualifiedRuleInvalid,
}

impl<'i> BasicParseErrorKind<'i> {
fn description(&self) -> String {
impl<'i> fmt::Display for BasicParseErrorKind<'i> {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this to Display::fmt?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in the last commit

BasicParseErrorKind::UnexpectedToken(token) => {
format!("Unexpected token: {:?}", token)
write!(formatter, "Unexpected token: {:?}", token)
}
BasicParseErrorKind::EndOfInput => "End of input".to_owned(),
BasicParseErrorKind::AtRuleInvalid(message) => format!("Invalid @ rule: {}", message),
BasicParseErrorKind::AtRuleBodyInvalid => "Invalid @ rule body".to_owned(),
BasicParseErrorKind::QualifiedRuleInvalid => "Invalid qualified rule".to_owned(),
BasicParseErrorKind::EndOfInput => formatter.write_str("End of input"),
BasicParseErrorKind::AtRuleInvalid(message) => write!(formatter, "Invalid @ rule: {}", message),
BasicParseErrorKind::AtRuleBodyInvalid => formatter.write_str("Invalid @ rule body"),
BasicParseErrorKind::QualifiedRuleInvalid => formatter.write_str("Invalid qualified rule"),
}
}
}
Expand All @@ -79,7 +79,7 @@ pub struct BasicParseError<'i> {

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

Expand Down Expand Up @@ -189,7 +189,7 @@ where
{
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match &self.kind {
ParseErrorKind::Basic(basic_kind) => formatter.write_str(&basic_kind.description()),
ParseErrorKind::Basic(basic_kind) => basic_kind.fmt(formatter),
ParseErrorKind::Custom(custom_type) => custom_type.fmt(formatter),
}
}
Expand Down