Inline simple `Msg { msg }` to tuple

pull/775/head
Yuri Astrakhan 1 year ago
parent b50a6fa13a
commit a7a39914fe
  1. 6
      lib/oxrdf/src/parser.rs
  2. 10
      lib/oxrdfio/src/error.rs
  3. 8
      lib/oxrdfxml/src/error.rs

@ -444,12 +444,12 @@ enum TermParseErrorKind {
error: VariableNameParseError, error: VariableNameParseError,
value: String, value: String,
}, },
#[error("{msg}")] #[error("{0}")]
Msg { msg: &'static str }, Msg(&'static str),
} }
impl TermParseError { impl TermParseError {
pub(crate) fn msg(msg: &'static str) -> Self { pub(crate) fn msg(msg: &'static str) -> Self {
Self(TermParseErrorKind::Msg { msg }) Self(TermParseErrorKind::Msg(msg))
} }
} }

@ -14,7 +14,7 @@ pub enum ParseError {
impl ParseError { impl ParseError {
pub(crate) fn msg(msg: &'static str) -> Self { pub(crate) fn msg(msg: &'static str) -> Self {
Self::Syntax(SyntaxError(SyntaxErrorKind::Msg { msg })) Self::Syntax(SyntaxError(SyntaxErrorKind::Msg(msg)))
} }
} }
@ -74,8 +74,8 @@ enum SyntaxErrorKind {
Turtle(#[from] oxttl::SyntaxError), Turtle(#[from] oxttl::SyntaxError),
#[error(transparent)] #[error(transparent)]
RdfXml(#[from] oxrdfxml::SyntaxError), RdfXml(#[from] oxrdfxml::SyntaxError),
#[error("{msg}")] #[error("{0}")]
Msg { msg: &'static str }, Msg(&'static str),
} }
impl SyntaxError { impl SyntaxError {
@ -97,7 +97,7 @@ impl SyntaxError {
}, },
) )
} }
SyntaxErrorKind::RdfXml(_) | SyntaxErrorKind::Msg { .. } => None, SyntaxErrorKind::RdfXml(_) | SyntaxErrorKind::Msg(_) => None,
} }
} }
} }
@ -108,7 +108,7 @@ impl From<SyntaxError> for io::Error {
match error.0 { match error.0 {
SyntaxErrorKind::Turtle(error) => error.into(), SyntaxErrorKind::Turtle(error) => error.into(),
SyntaxErrorKind::RdfXml(error) => error.into(), SyntaxErrorKind::RdfXml(error) => error.into(),
SyntaxErrorKind::Msg { msg } => Self::new(io::ErrorKind::InvalidData, msg), SyntaxErrorKind::Msg(msg) => Self::new(io::ErrorKind::InvalidData, msg),
} }
} }
} }

@ -62,8 +62,8 @@ pub enum SyntaxErrorKind {
#[source] #[source]
error: LanguageTagParseError, error: LanguageTagParseError,
}, },
#[error("{msg}")] #[error("{0}")]
Msg { msg: String }, Msg(String),
} }
impl SyntaxError { impl SyntaxError {
@ -71,7 +71,7 @@ impl SyntaxError {
#[inline] #[inline]
pub(crate) fn msg(msg: impl Into<String>) -> Self { pub(crate) fn msg(msg: impl Into<String>) -> Self {
Self { Self {
inner: SyntaxErrorKind::Msg { msg: msg.into() }, inner: SyntaxErrorKind::Msg(msg.into()),
} }
} }
} }
@ -89,7 +89,7 @@ impl From<SyntaxError> for io::Error {
} }
_ => Self::new(io::ErrorKind::InvalidData, error), _ => Self::new(io::ErrorKind::InvalidData, error),
}, },
SyntaxErrorKind::Msg { msg } => Self::new(io::ErrorKind::InvalidData, msg), SyntaxErrorKind::Msg(msg) => Self::new(io::ErrorKind::InvalidData, msg),
_ => Self::new(io::ErrorKind::InvalidData, error), _ => Self::new(io::ErrorKind::InvalidData, error),
} }
} }

Loading…
Cancel
Save