Leverage derive_more::Error

Author: tyranron

juniper/Cargo.toml

@@ -51,7 +51,7 @@ bson = { version = "2.4", optional = true }
 chrono = { version = "0.4.30", features = ["alloc"], default-features = false, optional = true }
 chrono-tz = { version = "0.10", default-features = false, optional = true }
 compact_str = "0.9"
-derive_more = { version = "2.0", features = ["debug", "display"] }
+derive_more = { version = "2.0", features = ["debug", "display", "error"] }
 fnv = "1.0.5"
 futures = { version = "0.3.22", features = ["alloc"], default-features = false }
 graphql-parser = { version = "0.4", optional = true }

juniper/src/integrations/jiff.rs

@@ -50,9 +50,9 @@
 //! [s7]: https://graphql-scalars.dev/docs/scalars/duration
 //! [1]: https://docs.rs/jiff/latest/jiff/index.html#time-zone-features
 
-use std::{error::Error, str};
+use std::str;
 
-use derive_more::with_trait::{Debug, Display};
+use derive_more::with_trait::{Debug, Display, Error};
 
 use crate::{InputValue, ScalarValue, Value, graphql_scalar};
 
@@ -411,23 +411,18 @@ mod time_zone_or_utc_offset {
 }
 
 /// Error parsing a [`TimeZone`] value.
-#[derive(Clone, Debug, Display)]
+#[derive(Clone, Debug, Display, Error)]
 pub enum TimeZoneParsingError {
     /// Identifier cannot not be parsed by the [`jiff::tz::TimeZone::get()`] method.
     InvalidTimeZone(jiff::Error),
 
     /// GraphQL scalar [`TimeZone`] requires `tz::TimeZone` with IANA name.
     #[display("missing IANA name")]
-    MissingIanaName(#[debug(ignore)] jiff::tz::TimeZone),
-}
-
-impl Error for TimeZoneParsingError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match self {
-            Self::InvalidTimeZone(e) => Some(e),
-            Self::MissingIanaName(..) => None,
-        }
-    }
+    MissingIanaName(
+        #[debug(ignore)]
+        #[error(not(source))]
+        jiff::tz::TimeZone,
+    ),
 }
 
 /// Representation of a time zone from the [IANA Time Zone Database][0].

juniper/src/parser/lexer.rs

@@ -1,6 +1,6 @@
 use std::{char, iter::Peekable, str::CharIndices};
 
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Display, Error};
 
 use crate::parser::{SourcePosition, Spanning};
 
@@ -63,21 +63,21 @@ pub enum Token<'a> {
 }
 
 /// Error when tokenizing the input source
-#[derive(Clone, Debug, Display, Eq, PartialEq)]
+#[derive(Clone, Debug, Display, Eq, Error, PartialEq)]
 pub enum LexerError {
     /// An unknown character was found
     ///
     /// Unknown characters are characters that do not occur anywhere in the
     /// GraphQL language, such as `?` or `%`.
     #[display("Unknown character \"{_0}\"")]
-    UnknownCharacter(char),
+    UnknownCharacter(#[error(not(source))] char),
 
     /// An unexpected character was found
     ///
     /// Unexpected characters are characters that _do_ exist in the GraphQL
     /// language, but is not expected at the current position in the document.
     #[display("Unexpected character \"{_0}\"")]
-    UnexpectedCharacter(char),
+    UnexpectedCharacter(#[error(not(source))] char),
 
     /// An unterminated string literal was found
     ///
@@ -92,14 +92,14 @@ pub enum LexerError {
     /// This occurs when an invalid source character is found in a string
     /// literal, such as ASCII control characters.
     #[display("Unknown character \"{_0}\" in string literal")]
-    UnknownCharacterInString(char),
+    UnknownCharacterInString(#[error(not(source))] char),
 
     /// An unknown escape sequence in a string literal was found
     ///
     /// Only a limited set of escape sequences are supported, this is emitted
     /// when e.g. `"\l"` is parsed.
     #[display("Unknown escape sequence \"{_0}\" in string")]
-    UnknownEscapeSequence(String),
+    UnknownEscapeSequence(#[error(not(source))] String),
 
     /// The input source was unexpectedly terminated
     ///
@@ -516,5 +516,3 @@ fn is_name_cont(c: char) -> bool {
 fn is_number_start(c: char) -> bool {
     c == '-' || c.is_ascii_digit()
 }
-
-impl std::error::Error for LexerError {}

juniper/src/parser/parser.rs

@@ -1,18 +1,18 @@
-use std::{error::Error, fmt};
+use std::fmt;
 
 use compact_str::{CompactString, format_compact};
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Display, Error};
 
 use crate::parser::{Lexer, LexerError, Spanning, Token};
 
 /// Error while parsing a GraphQL query
-#[derive(Clone, Debug, Display, Eq, PartialEq)]
+#[derive(Clone, Debug, Display, Eq, Error, PartialEq)]
 pub enum ParseError {
     /// An unexpected token occurred in the source
     // TODO: Previously was `Token<'a>`.
     //       Revisit on `graphql-parser` integration.
     #[display("Unexpected \"{_0}\"")]
-    UnexpectedToken(CompactString),
+    UnexpectedToken(#[error(not(source))] CompactString),
 
     /// The input source abruptly ended
     #[display("Unexpected end of input")]
@@ -22,18 +22,7 @@ pub enum ParseError {
     LexerError(LexerError),
 
     /// A scalar of unexpected type occurred in the source
-    ExpectedScalarError(&'static str),
-}
-
-impl Error for ParseError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match self {
-            Self::LexerError(e) => Some(e),
-            Self::ExpectedScalarError(_) | Self::UnexpectedToken(_) | Self::UnexpectedEndOfFile => {
-                None
-            }
-        }
-    }
+    ExpectedScalarError(#[error(not(source))] &'static str),
 }
 
 impl ParseError {

juniper/src/parser/utils.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Display, Error};
 
 /// A reference to a line and column in an input source file
 #[derive(Clone, Copy, Debug, Display, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -54,9 +54,10 @@ impl Span {
 }
 
 /// Data structure used to wrap items into a [`Span`].
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, Error, Hash, PartialEq)]
 pub struct Spanning<T, Sp = Span> {
     /// Wrapped item.
+    #[error(source)]
     pub item: T,
 
     /// [`Span`] of the wrapped item.
@@ -145,8 +146,6 @@ impl<T: Display> Display for Spanning<T> {
     }
 }
 
-impl<T: std::error::Error> std::error::Error for Spanning<T> {}
-
 impl SourcePosition {
     #[doc(hidden)]
     pub fn new(index: usize, line: usize, col: usize) -> SourcePosition {

juniper/src/types/name.rs

@@ -1,7 +1,7 @@
-use std::{borrow::Borrow, error::Error};
+use std::borrow::Borrow;
 
 use arcstr::ArcStr;
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Display, Error};
 
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct Name(ArcStr);
@@ -49,14 +49,8 @@ impl Borrow<str> for Name {
     }
 }
 
-#[derive(Clone, Debug, Display, Eq, Ord, PartialEq, PartialOrd)]
-pub struct NameParseError(ArcStr);
-
-impl Error for NameParseError {
-    fn description(&self) -> &str {
-        &self.0
-    }
-}
+#[derive(Clone, Debug, Display, Eq, Error, Ord, PartialEq, PartialOrd)]
+pub struct NameParseError(#[error(not(source))] ArcStr);
 
 #[test]
 fn test_name_is_valid() {

juniper/src/validation/context.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashSet, fmt::Debug};
 
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Display, Error};
 use itertools::Itertools as _;
 
 use crate::{
@@ -13,7 +13,7 @@ use crate::schema::{meta::MetaType, model::SchemaType};
 use crate::parser::SourcePosition;
 
 /// Query validation error
-#[derive(Clone, Debug, Display, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Debug, Display, Eq, Error, Ord, PartialEq, PartialOrd)]
 #[display("{message}. At {}", locations.iter().format(", "))]
 pub struct RuleError {
     locations: Vec<SourcePosition>,
@@ -55,8 +55,6 @@ impl RuleError {
     }
 }
 
-impl std::error::Error for RuleError {}
-
 impl<'a, S: Debug> ValidatorContext<'a, S> {
     #[doc(hidden)]
     pub fn new(schema: &'a SchemaType<S>, document: &Document<'a, S>) -> ValidatorContext<'a, S> {

juniper_actix/Cargo.toml

@@ -32,7 +32,7 @@ subscriptions = [
 [dependencies]
 actix-web = "4.4"
 actix-ws = { version = "0.3", optional = true }
-derive_more = { version = "2.0", features = ["display"], optional = true }
+derive_more = { version = "2.0", features = ["display", "error"], optional = true }
 futures = { version = "0.3.22", optional = true }
 juniper = { version = "0.16", path = "../juniper", default-features = false }
 juniper_graphql_ws = { version = "0.4.0", path = "../juniper_graphql_ws", features = ["graphql-transport-ws", "graphql-ws"], optional = true }

juniper_actix/src/lib.rs

@@ -174,7 +174,7 @@ pub mod subscriptions {
         http::header::{HeaderName, HeaderValue},
         web,
     };
-    use derive_more::with_trait::Display;
+    use derive_more::with_trait::{Display, Error as StdError};
     use futures::{SinkExt as _, StreamExt as _, future};
     use juniper::{GraphQLSubscriptionType, GraphQLTypeAsync, RootNode, ScalarValue};
     use juniper_graphql_ws::{ArcSchema, Init, graphql_transport_ws, graphql_ws};
@@ -418,18 +418,16 @@ pub mod subscriptions {
     }
 
     /// Possible errors of serving an [`actix_ws`] connection.
-    #[derive(Debug, Display)]
+    #[derive(Debug, Display, StdError)]
     enum Error {
         /// Deserializing of a client [`actix_ws::Message`] failed.
         #[display("`serde` error: {_0}")]
         Serde(serde_json::Error),
 
         /// Unexpected client [`actix_ws::Message`].
         #[display("unexpected message received from client: {_0:?}")]
-        UnexpectedClientMessage(actix_ws::Message),
+        UnexpectedClientMessage(#[error(not(source))] actix_ws::Message),
     }
-
-    impl std::error::Error for Error {}
 }
 
 #[cfg(test)]

juniper_axum/Cargo.toml

@@ -31,7 +31,7 @@ subscriptions = [
 
 [dependencies]
 axum = { version = "0.8", features = ["json", "query"], default-features = false }
-derive_more = { version = "2.0", features = ["display"], optional = true }
+derive_more = { version = "2.0", features = ["display", "error"], optional = true }
 futures = { version = "0.3.22", optional = true }
 juniper = { version = "0.16", path = "../juniper", default-features = false }
 juniper_graphql_ws = { version = "0.4.0", path = "../juniper_graphql_ws", features = ["graphql-transport-ws"] }