From 8c933dbc3671fb36cc9c4d99d5489864cae081cc Mon Sep 17 00:00:00 2001 From: Sunli Date: Fri, 16 Oct 2020 10:45:27 +0800 Subject: [PATCH] Make imports consistent --- .github/workflows/ci.yml | 2 +- derive/src/args.rs | 25 +++++++------------------ derive/src/enum.rs | 5 +++-- derive/src/input_object.rs | 9 +++++---- derive/src/interface.rs | 7 ++++--- derive/src/merged_object.rs | 5 +++-- derive/src/merged_subscription.rs | 5 +++-- derive/src/object.rs | 9 +++++---- derive/src/scalar.rs | 5 +++-- derive/src/simple_object.rs | 5 +++-- derive/src/subscription.rs | 15 ++++++++------- derive/src/union.rs | 5 +++-- derive/src/utils.rs | 3 ++- value/src/de.rs | 6 ++++-- value/src/lib.rs | 5 +++-- value/src/ser.rs | 8 +++++--- 16 files changed, 62 insertions(+), 57 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99748ab8..06f5ffe8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Check examples with clippy run: cargo clippy --all working-directory: ./examples - - name: Build + - name: Build examples run: cargo build --all --verbose working-directory: ./examples diff --git a/derive/src/args.rs b/derive/src/args.rs index 297082e4..b72ce5d1 100644 --- a/derive/src/args.rs +++ b/derive/src/args.rs @@ -362,13 +362,19 @@ pub struct MergedSubscription { pub name: Option, } -#[derive(Debug, Copy, Clone)] +#[derive(Debug, Copy, Clone, FromMeta)] pub enum RenameRule { + #[darling(rename = "lowercase")] Lower, + #[darling(rename = "UPPERCASE")] Upper, + #[darling(rename = "PascalCase")] Pascal, + #[darling(rename = "camelCase")] Camel, + #[darling(rename = "snake_case")] Snake, + #[darling(rename = "SCREAMING_SNAKE_CASE")] ScreamingSnake, } @@ -385,23 +391,6 @@ impl RenameRule { } } -impl FromMeta for RenameRule { - fn from_string(value: &str) -> darling::Result { - match value { - "lowercase" => Ok(Self::Lower), - "UPPERCASE" => Ok(Self::Upper), - "PascalCase" => Ok(Self::Pascal), - "camelCase" => Ok(Self::Camel), - "snake_case" => Ok(Self::Snake), - "SCREAMING_SNAKE_CASE" => Ok(Self::ScreamingSnake), - _ => Err(darling::Error::custom(format!( - "Unknown rename rule: \"{}\"", - value - ))), - } - } -} - #[derive(Debug, Copy, Clone)] pub enum RenameTarget { Type, diff --git a/derive/src/enum.rs b/derive/src/enum.rs index 55bf3081..54bbab12 100644 --- a/derive/src/enum.rs +++ b/derive/src/enum.rs @@ -1,11 +1,12 @@ -use crate::args::{self, RenameRuleExt, RenameTarget}; -use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::Data; use proc_macro::TokenStream; use quote::quote; use syn::ext::IdentExt; use syn::Error; +use crate::args::{self, RenameRuleExt, RenameTarget}; +use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(enum_args: &args::Enum) -> GeneratorResult { let crate_name = get_crate_name(enum_args.internal); let ident = &enum_args.ident; diff --git a/derive/src/input_object.rs b/derive/src/input_object.rs index 295e7414..82fa3458 100644 --- a/derive/src/input_object.rs +++ b/derive/src/input_object.rs @@ -1,13 +1,14 @@ -use crate::args::{self, RenameRuleExt, RenameTarget}; -use crate::utils::{ - generate_default, generate_validator, get_crate_name, get_rustdoc, GeneratorResult, -}; use darling::ast::Data; use proc_macro::TokenStream; use quote::quote; use syn::ext::IdentExt; use syn::Error; +use crate::args::{self, RenameRuleExt, RenameTarget}; +use crate::utils::{ + generate_default, generate_validator, get_crate_name, get_rustdoc, GeneratorResult, +}; + pub fn generate(object_args: &args::InputObject) -> GeneratorResult { let crate_name = get_crate_name(object_args.internal); let ident = &object_args.ident; diff --git a/derive/src/interface.rs b/derive/src/interface.rs index fe757007..c5d73ead 100644 --- a/derive/src/interface.rs +++ b/derive/src/interface.rs @@ -1,6 +1,3 @@ -use crate::args::{self, InterfaceField, InterfaceFieldArgument, RenameRuleExt, RenameTarget}; -use crate::output_type::OutputType; -use crate::utils::{generate_default, get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::{Data, Style}; use proc_macro::TokenStream; use proc_macro2::{Ident, Span}; @@ -9,6 +6,10 @@ use std::collections::HashSet; use syn::visit_mut::VisitMut; use syn::{visit_mut, Error, Lifetime, Type}; +use crate::args::{self, InterfaceField, InterfaceFieldArgument, RenameRuleExt, RenameTarget}; +use crate::output_type::OutputType; +use crate::utils::{generate_default, get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(interface_args: &args::Interface) -> GeneratorResult { let crate_name = get_crate_name(interface_args.internal); let ident = &interface_args.ident; diff --git a/derive/src/merged_object.rs b/derive/src/merged_object.rs index c3096d80..05180600 100644 --- a/derive/src/merged_object.rs +++ b/derive/src/merged_object.rs @@ -1,11 +1,12 @@ -use crate::args::{self, RenameTarget}; -use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::Data; use proc_macro::TokenStream; use proc_macro2::Span; use quote::quote; use syn::{Error, LitInt}; +use crate::args::{self, RenameTarget}; +use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(object_args: &args::MergedObject) -> GeneratorResult { let crate_name = get_crate_name(object_args.internal); let ident = &object_args.ident; diff --git a/derive/src/merged_subscription.rs b/derive/src/merged_subscription.rs index 0469aa94..3a12b0b9 100644 --- a/derive/src/merged_subscription.rs +++ b/derive/src/merged_subscription.rs @@ -1,11 +1,12 @@ -use crate::args::{self, RenameTarget}; -use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::Data; use proc_macro::TokenStream; use proc_macro2::Span; use quote::quote; use syn::{Error, LitInt}; +use crate::args::{self, RenameTarget}; +use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(object_args: &args::MergedSubscription) -> GeneratorResult { let crate_name = get_crate_name(object_args.internal); let ident = &object_args.ident; diff --git a/derive/src/object.rs b/derive/src/object.rs index 81841898..ddc47544 100644 --- a/derive/src/object.rs +++ b/derive/src/object.rs @@ -1,3 +1,8 @@ +use proc_macro::TokenStream; +use quote::quote; +use syn::ext::IdentExt; +use syn::{Block, Error, FnArg, ImplItem, ItemImpl, Pat, ReturnType, Type, TypeReference}; + use crate::args::{self, RenameRuleExt, RenameTarget}; use crate::output_type::OutputType; use crate::utils::{ @@ -5,10 +10,6 @@ use crate::utils::{ get_param_getter_ident, get_rustdoc, parse_graphql_attrs, remove_graphql_attrs, GeneratorResult, }; -use proc_macro::TokenStream; -use quote::quote; -use syn::ext::IdentExt; -use syn::{Block, Error, FnArg, ImplItem, ItemImpl, Pat, ReturnType, Type, TypeReference}; pub fn generate( object_args: &args::Object, diff --git a/derive/src/scalar.rs b/derive/src/scalar.rs index 5a2621cb..cdbdc22d 100644 --- a/derive/src/scalar.rs +++ b/derive/src/scalar.rs @@ -1,9 +1,10 @@ -use crate::args::{self, RenameTarget}; -use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; use proc_macro::TokenStream; use quote::quote; use syn::{Error, ItemImpl, Type}; +use crate::args::{self, RenameTarget}; +use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate( scalar_args: &args::Scalar, item_impl: &mut ItemImpl, diff --git a/derive/src/simple_object.rs b/derive/src/simple_object.rs index 3cec6395..8b08fc43 100644 --- a/derive/src/simple_object.rs +++ b/derive/src/simple_object.rs @@ -1,11 +1,12 @@ -use crate::args::{self, RenameRuleExt, RenameTarget}; -use crate::utils::{generate_guards, get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::Data; use proc_macro::TokenStream; use quote::quote; use syn::ext::IdentExt; use syn::Error; +use crate::args::{self, RenameRuleExt, RenameTarget}; +use crate::utils::{generate_guards, get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(object_args: &args::SimpleObject) -> GeneratorResult { let crate_name = get_crate_name(object_args.internal); let ident = &object_args.ident; diff --git a/derive/src/subscription.rs b/derive/src/subscription.rs index aa17a182..5e4c7930 100644 --- a/derive/src/subscription.rs +++ b/derive/src/subscription.rs @@ -1,10 +1,3 @@ -use crate::args::{self, RenameRuleExt, RenameTarget, SubscriptionField}; -use crate::output_type::OutputType; -use crate::utils::{ - generate_default, generate_guards, generate_validator, get_cfg_attrs, get_crate_name, - get_param_getter_ident, get_rustdoc, parse_graphql_attrs, remove_graphql_attrs, - GeneratorResult, -}; use proc_macro::TokenStream; use quote::quote; use syn::ext::IdentExt; @@ -13,6 +6,14 @@ use syn::{ TypeReference, }; +use crate::args::{self, RenameRuleExt, RenameTarget, SubscriptionField}; +use crate::output_type::OutputType; +use crate::utils::{ + generate_default, generate_guards, generate_validator, get_cfg_attrs, get_crate_name, + get_param_getter_ident, get_rustdoc, parse_graphql_attrs, remove_graphql_attrs, + GeneratorResult, +}; + pub fn generate( subscription_args: &args::Subscription, item_impl: &mut ItemImpl, diff --git a/derive/src/union.rs b/derive/src/union.rs index adb1338a..d1405bb4 100644 --- a/derive/src/union.rs +++ b/derive/src/union.rs @@ -1,5 +1,3 @@ -use crate::args::{self, RenameTarget}; -use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; use darling::ast::{Data, Style}; use proc_macro::TokenStream; use proc_macro2::{Ident, Span}; @@ -8,6 +6,9 @@ use std::collections::HashSet; use syn::visit_mut::VisitMut; use syn::{visit_mut, Error, Lifetime, Type}; +use crate::args::{self, RenameTarget}; +use crate::utils::{get_crate_name, get_rustdoc, GeneratorResult}; + pub fn generate(union_args: &args::Union) -> GeneratorResult { let crate_name = get_crate_name(union_args.internal); let ident = &union_args.ident; diff --git a/derive/src/utils.rs b/derive/src/utils.rs index e1b90104..f17b3c81 100644 --- a/derive/src/utils.rs +++ b/derive/src/utils.rs @@ -1,4 +1,3 @@ -use crate::args; use darling::FromMeta; use proc_macro2::{Span, TokenStream, TokenTree}; use proc_macro_crate::crate_name; @@ -6,6 +5,8 @@ use quote::quote; use syn::{Attribute, Error, Expr, Ident, Lit, LitStr, Meta, NestedMeta}; use thiserror::Error; +use crate::args; + #[derive(Error, Debug)] pub enum GeneratorError { #[error("{0}")] diff --git a/value/src/de.rs b/value/src/de.rs index b9cc2f40..33d921ff 100644 --- a/value/src/de.rs +++ b/value/src/de.rs @@ -1,11 +1,13 @@ +use std::collections::BTreeMap; +use std::{fmt, vec}; + use crate::{ConstValue, Name}; + use serde::de::{ self, Deserialize, DeserializeOwned, DeserializeSeed, EnumAccess, Error as DeError, IntoDeserializer, MapAccess, SeqAccess, Unexpected, VariantAccess, Visitor, }; use serde::forward_to_deserialize_any; -use std::collections::BTreeMap; -use std::{fmt, vec}; /// This type represents errors that can occur when deserializing. #[derive(Debug)] diff --git a/value/src/lib.rs b/value/src/lib.rs index bd4269ff..bd220a3f 100644 --- a/value/src/lib.rs +++ b/value/src/lib.rs @@ -7,8 +7,6 @@ mod de; mod macros; mod ser; -use serde::ser::Error; -use serde::{Deserialize, Deserializer, Serialize, Serializer}; use std::borrow::{Borrow, Cow}; use std::collections::BTreeMap; use std::convert::{TryFrom, TryInto}; @@ -17,6 +15,9 @@ use std::iter::FromIterator; use std::ops::Deref; use std::sync::Arc; +use serde::ser::Error; +use serde::{Deserialize, Deserializer, Serialize, Serializer}; + pub use de::{from_value, DeserializerError}; pub use ser::{to_value, SerializerError}; pub use serde_json::Number; diff --git a/value/src/ser.rs b/value/src/ser.rs index 846502bd..383485f5 100644 --- a/value/src/ser.rs +++ b/value/src/ser.rs @@ -1,10 +1,12 @@ -use crate::{ConstValue, Name, Number}; -use serde::ser::{self, Impossible}; -use serde::Serialize; use std::collections::BTreeMap; use std::error::Error; use std::fmt; +use serde::ser::{self, Impossible}; +use serde::Serialize; + +use crate::{ConstValue, Name, Number}; + /// This type represents errors that can occur when serializing. #[derive(Debug)] pub struct SerializerError(String);