From a7a39914feaf6a29f4f1909a2464ec238946b1e3 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Sat, 10 Feb 2024 00:53:56 -0500 Subject: [PATCH] Inline simple `Msg { msg }` to tuple --- lib/oxrdf/src/parser.rs | 6 +++--- lib/oxrdfio/src/error.rs | 10 +++++----- lib/oxrdfxml/src/error.rs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/oxrdf/src/parser.rs b/lib/oxrdf/src/parser.rs index 59f488cd..a531a86e 100644 --- a/lib/oxrdf/src/parser.rs +++ b/lib/oxrdf/src/parser.rs @@ -444,12 +444,12 @@ enum TermParseErrorKind { error: VariableNameParseError, value: String, }, - #[error("{msg}")] - Msg { msg: &'static str }, + #[error("{0}")] + Msg(&'static str), } impl TermParseError { pub(crate) fn msg(msg: &'static str) -> Self { - Self(TermParseErrorKind::Msg { msg }) + Self(TermParseErrorKind::Msg(msg)) } } diff --git a/lib/oxrdfio/src/error.rs b/lib/oxrdfio/src/error.rs index bc02d921..cd2c4449 100644 --- a/lib/oxrdfio/src/error.rs +++ b/lib/oxrdfio/src/error.rs @@ -14,7 +14,7 @@ pub enum ParseError { impl ParseError { 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), #[error(transparent)] RdfXml(#[from] oxrdfxml::SyntaxError), - #[error("{msg}")] - Msg { msg: &'static str }, + #[error("{0}")] + Msg(&'static str), } impl SyntaxError { @@ -97,7 +97,7 @@ impl SyntaxError { }, ) } - SyntaxErrorKind::RdfXml(_) | SyntaxErrorKind::Msg { .. } => None, + SyntaxErrorKind::RdfXml(_) | SyntaxErrorKind::Msg(_) => None, } } } @@ -108,7 +108,7 @@ impl From for io::Error { match error.0 { SyntaxErrorKind::Turtle(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), } } } diff --git a/lib/oxrdfxml/src/error.rs b/lib/oxrdfxml/src/error.rs index 77e38341..b4b4bf1f 100644 --- a/lib/oxrdfxml/src/error.rs +++ b/lib/oxrdfxml/src/error.rs @@ -62,8 +62,8 @@ pub enum SyntaxErrorKind { #[source] error: LanguageTagParseError, }, - #[error("{msg}")] - Msg { msg: String }, + #[error("{0}")] + Msg(String), } impl SyntaxError { @@ -71,7 +71,7 @@ impl SyntaxError { #[inline] pub(crate) fn msg(msg: impl Into) -> Self { Self { - inner: SyntaxErrorKind::Msg { msg: msg.into() }, + inner: SyntaxErrorKind::Msg(msg.into()), } } } @@ -89,7 +89,7 @@ impl From for io::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), } }