Leverage derive_more::Debug

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 = ["display"] }
+derive_more = { version = "2.0", features = ["debug", "display"] }
 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, fmt, str};
+use std::{error::Error, str};
 
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Debug, Display};
 
 use crate::{InputValue, ScalarValue, Value, graphql_scalar};
 
@@ -411,23 +411,14 @@ mod time_zone_or_utc_offset {
 }
 
 /// Error parsing a [`TimeZone`] value.
-#[derive(Clone, Display)]
+#[derive(Clone, Debug, Display)]
 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(jiff::tz::TimeZone),
-}
-
-impl fmt::Debug for TimeZoneParsingError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::InvalidTimeZone(e) => write!(f, "TimeZoneParsingError::InvalidTimeZone({e:?})"),
-            Self::MissingIanaName(_) => write!(f, "TimeZoneParsingError::MissingIanaName(..)"),
-        }
-    }
+    MissingIanaName(#[debug(ignore)] jiff::tz::TimeZone),
 }
 
 impl Error for TimeZoneParsingError {

juniper/src/schema/meta.rs

@@ -1,8 +1,9 @@
 //! Types used to describe a `GraphQL` schema
 
-use std::{borrow::ToOwned, fmt};
+use std::borrow::ToOwned;
 
 use arcstr::ArcStr;
+use derive_more::with_trait::Debug;
 
 use crate::{
     FieldError, IntoFieldError,
@@ -42,27 +43,20 @@ impl DeprecationStatus {
 }
 
 /// Scalar type metadata
+#[derive(Debug)]
 pub struct ScalarMeta<S> {
     #[doc(hidden)]
     pub name: ArcStr,
     #[doc(hidden)]
     pub description: Option<ArcStr>,
     #[doc(hidden)]
     pub specified_by_url: Option<ArcStr>,
+    #[debug(ignore)]
     pub(crate) try_parse_fn: InputValueParseFn<S>,
+    #[debug(ignore)]
     pub(crate) parse_fn: ScalarTokenParseFn<S>,
 }
 
-impl<S: fmt::Debug> fmt::Debug for ScalarMeta<S> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("ScalarMeta")
-            .field("name", &self.name)
-            .field("description", &self.description)
-            .field("specified_by_url", &self.specified_by_url)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<S> ScalarMeta<S> {
     /// Builds a new [`ScalarMeta`] type with the specified `name`.
     pub fn new<T>(name: impl Into<ArcStr>) -> Self
@@ -213,26 +207,18 @@ impl<S> ObjectMeta<S> {
 }
 
 /// Enum type metadata
+#[derive(Debug)]
 pub struct EnumMeta<S> {
     #[doc(hidden)]
     pub name: ArcStr,
     #[doc(hidden)]
     pub description: Option<ArcStr>,
     #[doc(hidden)]
     pub values: Vec<EnumValue>,
+    #[debug(ignore)]
     pub(crate) try_parse_fn: InputValueParseFn<S>,
 }
 
-impl<S: fmt::Debug> fmt::Debug for EnumMeta<S> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("EnumMeta")
-            .field("name", &self.name)
-            .field("description", &self.description)
-            .field("values", &self.values)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<S> EnumMeta<S> {
     /// Builds a new [`EnumMeta`] type with the specified `name` and possible `values`.
     pub fn new<T>(name: impl Into<ArcStr>, values: &[EnumValue]) -> Self
@@ -354,26 +340,18 @@ impl UnionMeta {
 }
 
 /// Input object metadata
+#[derive(Debug)]
 pub struct InputObjectMeta<S> {
     #[doc(hidden)]
     pub name: ArcStr,
     #[doc(hidden)]
     pub description: Option<ArcStr>,
     #[doc(hidden)]
     pub input_fields: Vec<Argument<S>>,
+    #[debug(ignore)]
     pub(crate) try_parse_fn: InputValueParseFn<S>,
 }
 
-impl<S: fmt::Debug> fmt::Debug for InputObjectMeta<S> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("InputObjectMeta")
-            .field("name", &self.name)
-            .field("description", &self.description)
-            .field("input_fields", &self.input_fields)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<S> InputObjectMeta<S> {
     /// Builds a new [`InputObjectMeta`] type with the specified `name` and `input_fields`.
     pub fn new<T>(name: impl Into<ArcStr>, input_fields: &[Argument<S>]) -> Self

juniper_graphql_ws/Cargo.toml

@@ -26,6 +26,7 @@ graphql-transport-ws = []
 graphql-ws = []
 
 [dependencies]
+derive_more = { version = "2.0", features = ["debug"] }
 juniper = { version = "0.16", path = "../juniper", default-features = false }
 juniper_subscriptions = { version = "0.17.0", path = "../juniper_subscriptions" }
 serde = { version = "1.0.122", features = ["derive"], default-features = false }

juniper_graphql_ws/src/server_message.rs

@@ -1,7 +1,8 @@
 //! Common definitions regarding server messages.
 
-use std::{any::Any, fmt, marker::PhantomPinned};
+use std::{any::Any, marker::PhantomPinned};
 
+use derive_more::with_trait::Debug;
 use juniper::GraphQLError;
 use serde::{Serialize, Serializer};
 
@@ -15,6 +16,8 @@ use serde::{Serialize, Serializer};
 /// [`graphql_ws::DataPayload`]: crate::graphql_ws::DataPayload
 // XXX: Think carefully before deriving traits. This is self-referential (error references
 // _execution_params).
+#[derive(Debug)]
+#[debug("{error:?}")]
 pub struct ErrorPayload {
     _execution_params: Option<Box<dyn Any + Send>>,
     error: GraphQLError,
@@ -37,12 +40,6 @@ impl ErrorPayload {
     }
 }
 
-impl fmt::Debug for ErrorPayload {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.error.fmt(f)
-    }
-}
-
 impl PartialEq for ErrorPayload {
     fn eq(&self, other: &Self) -> bool {
         self.error.eq(&other.error)

juniper_hyper/Cargo.toml

@@ -18,7 +18,7 @@ keywords = ["apollo", "graphql", "hyper", "juniper"]
 exclude = ["/examples/", "/release.toml"]
 
 [dependencies]
-derive_more = { version = "2.0", features = ["display"] }
+derive_more = { version = "2.0", features = ["debug", "display"] }
 http-body-util = "0.1"
 hyper = { version = "1.0", features = ["server"] }
 juniper = { version = "0.16", path = "../juniper", default-features = false }

juniper_hyper/src/lib.rs

@@ -2,9 +2,9 @@
 #![cfg_attr(not(any(doc, test)), doc = env!("CARGO_PKG_NAME"))]
 #![cfg_attr(test, expect(unused_crate_dependencies, reason = "examples"))]
 
-use std::{error::Error, fmt, string::FromUtf8Error, sync::Arc};
+use std::{error::Error, string::FromUtf8Error, sync::Arc};
 
-use derive_more::with_trait::Display;
+use derive_more::with_trait::{Debug, Display};
 use http_body_util::BodyExt as _;
 use hyper::{
     Method, Request, Response, StatusCode,
@@ -34,7 +34,7 @@ where
     SubscriptionT::TypeInfo: Sync,
     CtxT: Sync,
     S: ScalarValue + Send + Sync,
-    B: Body<Error: fmt::Display>,
+    B: Body<Error: Display>,
 {
     match parse_req(req).await {
         Ok(req) => execute_request_sync(schema, context, req).await,
@@ -58,7 +58,7 @@ where
     SubscriptionT::TypeInfo: Sync,
     CtxT: Sync,
     S: ScalarValue + Send + Sync,
-    B: Body<Error: fmt::Display>,
+    B: Body<Error: Display>,
 {
     match parse_req(req).await {
         Ok(req) => execute_request(schema, context, req).await,
@@ -69,7 +69,7 @@ where
 async fn parse_req<S, B>(req: Request<B>) -> Result<GraphQLBatchRequest<S>, Response<String>>
 where
     S: ScalarValue,
-    B: Body<Error: fmt::Display>,
+    B: Body<Error: Display>,
 {
     match *req.method() {
         Method::GET => parse_get_req(req),
@@ -176,7 +176,7 @@ pub async fn playground(
 
 fn render_error<B>(err: GraphQLRequestError<B>) -> Response<String>
 where
-    B: Body<Error: fmt::Display>,
+    B: Body<Error: Display>,
 {
     let mut resp = new_response(StatusCode::BAD_REQUEST);
     *resp.body_mut() = err.to_string();
@@ -312,32 +312,21 @@ fn new_html_response(code: StatusCode) -> Response<String> {
     resp
 }
 
-#[derive(Display)]
+// TODO: Use `#[debug(forward)]` once `derive_more::Debug` is capable of it.
+#[derive(Debug, Display)]
 enum GraphQLRequestError<B: Body> {
+    #[debug("{_0:?}")]
     BodyHyper(B::Error),
+    #[debug("{_0:?}")]
     BodyUtf8(FromUtf8Error),
+    #[debug("{_0:?}")]
     BodyJSONError(SerdeError),
+    #[debug("{_0:?}")]
     Variables(SerdeError),
+    #[debug("{_0:?}")]
     Invalid(String),
 }
 
-// NOTE: Manual implementation instead of `#[derive(Debug)]` is used to omit imposing unnecessary
-//       `B: Debug` bound on the implementation.
-impl<B> fmt::Debug for GraphQLRequestError<B>
-where
-    B: Body<Error: fmt::Debug>,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::BodyHyper(e) => fmt::Debug::fmt(e, f),
-            Self::BodyUtf8(e) => fmt::Debug::fmt(e, f),
-            Self::BodyJSONError(e) => fmt::Debug::fmt(e, f),
-            Self::Variables(e) => fmt::Debug::fmt(e, f),
-            Self::Invalid(e) => fmt::Debug::fmt(e, f),
-        }
-    }
-}
-
 impl<B> Error for GraphQLRequestError<B>
 where
     B: Body<Error: Error + 'static>,