Polishing, vol.4

Author: tyranron

juniper/CHANGELOG.md

@@ -32,17 +32,38 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
     - Renamed `ObjectId` scalar to `ObjectID` in types: ([#1277])
         - `bson::oid::ObjectId`.
 - Optimized schema implementation with [`arcstr` crate]: ([#1247], [#819])
-    - Removed lifetime parameters from `MetaType` and its members.
-    - Made `MetaType::name()`, `MetaType::description()` and `MetaType::specified_by_url()` returning `ArcStr`.
-    - Made `DeprecationStatus::reason()` returning `ArcStr`.
-    - Removed lifetime parameters from `DirectiveType`.
-    - Made `DirectiveType::name` and `DirectiveType::description` using `ArcStr`.
-    - Removed lifetime parameter from `SchemaType` and `Registry`.
-    - Made `types::Name` and `types::NameParseError` using `ArcStr` instead of `String`.
-    - Replaced `FromStr` impl of `types::Name` with `types::Name::new()` constructor.
-    - Made `GraphQLType::name()` and `GraphQLValue::type_name()` returning `ArcStr`.
-    - Removed lifetime parameters from `RootNode`.
-    - Removed lifetime parameters from `ast::Type` and made it generic over string type.
+    - `ast::Type`: 
+        - Removed lifetime parameters.
+        - Made it generic over string type.
+    - `MetaType`:
+        - Removed lifetime parameters.
+        - Made `name()`, `description()` and `specified_by_url()` methods returning `ArcStr`.
+    - `EnumMeta`, `InputObjectMeta`, `InterfaceMeta`, `ListMeta`, `NullableMeta`, `ObjectMeta`, `PlaceholderMeta`, `ScalarMeta` and `UnionMeta`:
+        - Removed lifetime parameters.
+    - `meta::Field` and `meta::Argument`:
+        - Removed lifetime parameters.
+    - `meta::EnumValue`:
+        - Made `name` and `description` fields using `ArcStr`.
+    - `DeprecationStatus`:
+        - Made `Deprecated` variant using `ArcStr`.
+        - Made `reason()` method returning `ArcStr`.
+    - `DirectiveType`:
+        - Removed lifetime parameters.
+        - Made `name` and `description` fields using `ArcStr`.
+    - `SchemaType`: 
+        - Removed lifetime parameters.
+        - Made `is_subtype()` method accepting `DynType` instead of `Type`.
+    - `RootNode`:
+        - Removed lifetime parameters.
+    - `Registry`:
+        - Removed lifetime parameters.
+    - `types::Name` and `types::NameParseError`:
+        - Made fields using `ArcStr` instead of `String`.
+        - Replaced `FromStr` impl of `types::Name` with `new()` constructor.
+    - `GraphQLType`:
+        - Made `name()` method returning `ArcStr`.
+    - `GraphQLValue`:
+        - Made `type_name()` method returning `ArcStr`.
 
 ### Added
 

juniper/src/schema/meta.rs

@@ -18,6 +18,7 @@ use crate::{
 pub enum DeprecationStatus {
     /// The field/variant is not deprecated.
     Current,
+
     /// The field/variant is deprecated, with an optional reason
     Deprecated(Option<ArcStr>),
 }

juniper/src/schema/model.rs

@@ -299,8 +299,8 @@ impl<S> SchemaType<S> {
     }
 
     /// Add a description.
-    pub fn set_description(&mut self, description: ArcStr) {
-        self.description = Some(description);
+    pub fn set_description(&mut self, description: impl Into<ArcStr>) {
+        self.description = Some(description.into());
     }
 
     /// Add a directive like `skip` or `include`.
@@ -309,16 +309,16 @@ impl<S> SchemaType<S> {
     }
 
     /// Get a type by name.
-    pub fn type_by_name(&self, name: &str) -> Option<TypeType<S>> {
-        self.types.get(name).map(|t| TypeType::Concrete(t))
+    pub fn type_by_name(&self, name: impl AsRef<str>) -> Option<TypeType<S>> {
+        self.types.get(name.as_ref()).map(|t| TypeType::Concrete(t))
     }
 
     /// Get a concrete type by name.
-    pub fn concrete_type_by_name(&self, name: &str) -> Option<&MetaType<S>> {
-        self.types.get(name)
+    pub fn concrete_type_by_name(&self, name: impl AsRef<str>) -> Option<&MetaType<S>> {
+        self.types.get(name.as_ref())
     }
 
-    pub(crate) fn lookup_type<N: AsRef<str>>(&self, tpe: &Type<N>) -> Option<&MetaType<S>> {
+    pub(crate) fn lookup_type(&self, tpe: &Type<impl AsRef<str>>) -> Option<&MetaType<S>> {
         match tpe {
             Type::Named(name) | Type::NonNullNamed(name) => {
                 self.concrete_type_by_name(name.as_ref())
@@ -745,15 +745,14 @@ mod concrete_type_sort {
     }
 }
 
-/// Allows seeing [Type] with different name/string representations
-/// as the same type without allocating.
-//
-// TODO: Ideally this type should not exist, but the reason it currently does
-// is that [Type] has a recursive design to allow arbitrary number of list wrappings.
-// The list layout could instead be modelled as a modifier so that type becomes a tuple of (name, modifier).
-//
-// If [Type] is modelled like this it becomes easier to project it as a borrowed version of itself,
-// i.e. [Type<ArcStr>] vs [Type<&str>].
+/// Allows seeing [`Type`] with different name/string representations
+/// as the same type without allocation.
+// TODO: Ideally this type should not exist, but the reason it currently does is that `Type` has a
+//       recursive design to allow arbitrary number of list wrappings.
+//       The list layout could instead be modelled as a modifier so that type becomes a tuple of
+//       (name, modifier).
+//       If `Type` is modelled like this it becomes easier to project it as a borrowed version of
+//       itself, i.e. [Type<ArcStr>] vs [Type<&str>].
 #[derive(Clone, Copy, Debug)]
 pub enum DynType<'a> {
     Named(&'a str),
@@ -765,12 +764,12 @@ pub enum DynType<'a> {
 impl<'a> DynType<'a> {
     pub fn equals(&self, other: &DynType) -> bool {
         match (self, other) {
-            (DynType::Named(n0), DynType::Named(n1)) => n0 == n1,
-            (DynType::List(t0, s0), DynType::List(t1, s1)) => {
+            (Self::Named(n0), DynType::Named(n1)) => n0 == n1,
+            (Self::List(t0, s0), DynType::List(t1, s1)) => {
                 t0.as_dyn_type().equals(&t1.as_dyn_type()) && s0 == s1
             }
-            (DynType::NonNullNamed(n0), DynType::NonNullNamed(n1)) => n0 == n1,
-            (DynType::NonNullList(t0, s0), DynType::NonNullList(t1, s1)) => {
+            (Self::NonNullNamed(n0), DynType::NonNullNamed(n1)) => n0 == n1,
+            (Self::NonNullList(t0, s0), DynType::NonNullList(t1, s1)) => {
                 t0.as_dyn_type().equals(&t1.as_dyn_type()) && s0 == s1
             }
             _ => false,
@@ -796,11 +795,11 @@ impl fmt::Display for DynType<'_> {
     }
 }
 
-/// Trait for converting a [Type] into [DynType]
+/// Conversion of a [`Type`] into a [`DynType`].
 pub trait AsDynType: fmt::Debug {
-    /// Project [self] as a [DynType].
+    /// Project this value as a [`DynType`].
     ///
-    /// this function should not allocate memory.
+    /// Should not allocate memory.
     fn as_dyn_type(&self) -> DynType<'_>;
 }
 

juniper/src/schema/schema.rs

@@ -313,7 +313,7 @@ impl<'a, S: ScalarValue + 'a> TypeType<'a, S> {
                                 interface_names
                                     .iter()
                                     .any(|iname| iname == iface_name)
-                                    .then(|| name.as_ref())
+                                    .then_some(name)
                             } else {
                                 None
                             }

juniper/src/types/async_await.rs

@@ -203,8 +203,7 @@ where
         .concrete_type_by_name(
             instance
                 .type_name(info)
-                .expect("Resolving named type's selection set")
-                .as_ref(),
+                .expect("Resolving named type's selection set"),
         )
         .expect("Type not found in schema");
 

juniper/src/types/base.rs

@@ -425,8 +425,7 @@ where
         .concrete_type_by_name(
             instance
                 .type_name(info)
-                .expect("Resolving named type's selection set")
-                .as_ref(),
+                .expect("Resolving named type's selection set"),
         )
         .expect("Type not found in schema");
 

juniper/src/types/subscriptions.rs

@@ -274,8 +274,7 @@ where
         .concrete_type_by_name(
             instance
                 .type_name(info)
-                .expect("Resolving named type's selection set")
-                .as_ref(),
+                .expect("Resolving named type's selection set"),
         )
         .expect("Type not found in schema");