Leverage derive_more::AsRef, derive_more::AsMut and derive_more::Deref

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", "error", "from", "into", "into_iterator"] }
+derive_more = { version = "2.0", features = ["debug", "deref", "display", "error", "from", "into", "into_iterator"] }
 fnv = "1.0.5"
 futures = { version = "0.3.22", features = ["alloc"], default-features = false }
 graphql-parser = { version = "0.4", optional = true }

juniper/src/types/scalars.rs

@@ -1,6 +1,6 @@
-use std::{char, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle};
+use std::{char, marker::PhantomData, rc::Rc, thread::JoinHandle};
 
-use derive_more::with_trait::{Display, From, Into};
+use derive_more::with_trait::{Deref, Display, From, Into};
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -23,8 +23,9 @@ use crate::{
 ///
 /// Represented as a string, but can be converted _to_ from an integer as well.
 #[derive(
-    Clone, Debug, Deserialize, Display, Eq, From, GraphQLScalar, Into, PartialEq, Serialize,
+    Clone, Debug, Deref, Deserialize, Display, Eq, From, GraphQLScalar, Into, PartialEq, Serialize,
 )]
+#[deref(forward)]
 #[graphql(parse_token(String, i32))]
 pub struct ID(String);
 
@@ -49,14 +50,6 @@ impl ID {
     }
 }
 
-impl Deref for ID {
-    type Target = str;
-
-    fn deref(&self) -> &str {
-        &self.0
-    }
-}
-
 #[graphql_scalar]
 #[graphql(with = impl_string_scalar)]
 type String = std::string::String;

juniper_codegen/Cargo.toml

@@ -22,7 +22,7 @@ exclude = ["/release.toml"]
 proc-macro = true
 
 [dependencies]
-derive_more = { version = "2.0", features = ["display"] }
+derive_more = { version = "2.0", features = ["as_ref", "deref", "display"] }
 proc-macro2 = "1.0.4"
 quote = "1.0.9"
 syn = { version = "2.0", features = ["extra-traits", "full", "visit", "visit-mut"] }

juniper_codegen/src/common/span_container.rs

@@ -1,15 +1,15 @@
-use std::{
-    hash::{Hash, Hasher},
-    ops,
-};
+use std::hash::{Hash, Hasher};
 
+use derive_more::with_trait::{AsRef, Deref};
 use proc_macro2::{Span, TokenStream};
 use quote::ToTokens;
 
-#[derive(Clone, Copy, Debug)]
+#[derive(AsRef, Clone, Copy, Debug, Deref)]
 pub(crate) struct SpanContainer<T> {
     expr: Option<Span>,
     ident: Span,
+    #[as_ref]
+    #[deref]
     val: T,
 }
 
@@ -46,20 +46,6 @@ impl<T> SpanContainer<T> {
     }
 }
 
-impl<T> AsRef<T> for SpanContainer<T> {
-    fn as_ref(&self) -> &T {
-        &self.val
-    }
-}
-
-impl<T> ops::Deref for SpanContainer<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.val
-    }
-}
-
 impl<T: PartialEq> PartialEq for SpanContainer<T> {
     fn eq(&self, other: &Self) -> bool {
         self.val == other.val

juniper_rocket/Cargo.toml

@@ -19,6 +19,7 @@ keywords = ["apollo", "graphql", "juniper", "rocket"]
 exclude = ["/examples/", "/tests/", "/release.toml"]
 
 [dependencies]
+derive_more = { version = "2.0", features = ["as_ref"] }
 juniper = { version = "0.16", path = "../juniper", default-features = false }
 rocket = { version = "0.5", default-features = false }
 serde_json = "1.0.18"

juniper_rocket/src/lib.rs

@@ -15,6 +15,12 @@ mod for_tests_only {
 
 use std::{borrow::Cow, io::Cursor};
 
+use derive_more::with_trait::{AsMut, AsRef};
+use juniper::{
+    DefaultScalarValue, FieldError, GraphQLSubscriptionType, GraphQLType, GraphQLTypeAsync,
+    InputValue, RootNode, ScalarValue,
+    http::{self, GraphQLBatchRequest},
+};
 use rocket::{
     Data, Request,
     data::{self, FromData, ToByteUnit},
@@ -24,12 +30,6 @@ use rocket::{
     response::{self, Responder, Response, content::RawHtml},
 };
 
-use juniper::{
-    DefaultScalarValue, FieldError, GraphQLSubscriptionType, GraphQLType, GraphQLTypeAsync,
-    InputValue, RootNode, ScalarValue,
-    http::{self, GraphQLBatchRequest},
-};
-
 /// Simple wrapper around an incoming GraphQL request.
 ///
 /// See the [`http`] module for more information. This type can be constructed automatically from
@@ -74,23 +74,11 @@ use juniper::{
 ///     .manage(Schema::new(Query, EmptyMutation::new(), EmptySubscription::new()))
 ///     .mount("/", routes![get_graphql_handler, post_graphql_handler]);
 /// ```
-#[derive(Debug, PartialEq)]
+#[derive(AsRef, AsMut, Debug, PartialEq)]
 pub struct GraphQLRequest<S = DefaultScalarValue>(GraphQLBatchRequest<S>)
 where
     S: ScalarValue;
 
-impl<S: ScalarValue> AsRef<GraphQLBatchRequest<S>> for GraphQLRequest<S> {
-    fn as_ref(&self) -> &GraphQLBatchRequest<S> {
-        &self.0
-    }
-}
-
-impl<S: ScalarValue> AsMut<GraphQLBatchRequest<S>> for GraphQLRequest<S> {
-    fn as_mut(&mut self) -> &mut GraphQLBatchRequest<S> {
-        &mut self.0
-    }
-}
-
 /// Simple wrapper around the result of executing a GraphQL query
 pub struct GraphQLResponse(pub Status, pub String);