cargo fmt --all

h-michael · h-michael · commit 8f8e90961971 · 2019-03-30T16:11:47.000+09:00
diff --git a/graphql_client_codegen/src/codegen.rs b/graphql_client_codegen/src/codegen.rs
@@ -1,11 +1,11 @@
-use failure;
 use crate::fragments::GqlFragment;
-use graphql_parser::query;
 use crate::operations::Operation;
-use proc_macro2::TokenStream;
 use crate::query::QueryContext;
 use crate::schema;
 use crate::selection::Selection;
+use failure;
+use graphql_parser::query;
+use proc_macro2::TokenStream;
 
 /// Selects the first operation matching `struct_name`. Returns `None` when the query document defines no operation, or when the selected operation does not match any defined operation.
 pub(crate) fn select_operation<'query>(
diff --git a/graphql_client_codegen/src/enums.rs b/graphql_client_codegen/src/enums.rs
@@ -18,7 +18,10 @@ pub struct GqlEnum<'schema> {
 }
 
 impl<'schema> GqlEnum<'schema> {
-    pub(crate) fn to_rust(&self, query_context: &crate::query::QueryContext<'_, '_>) -> TokenStream {
+    pub(crate) fn to_rust(
+        &self,
+        query_context: &crate::query::QueryContext<'_, '_>,
+    ) -> TokenStream {
         let derives = query_context.response_enum_derives();
         let variant_names: Vec<TokenStream> = self
             .variants
diff --git a/graphql_client_codegen/src/field_type.rs b/graphql_client_codegen/src/field_type.rs
@@ -1,9 +1,9 @@
 use crate::enums::ENUMS_PREFIX;
-use graphql_parser;
 use crate::introspection_response;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::schema::DEFAULT_SCALARS;
+use graphql_parser;
+use proc_macro2::{Ident, Span, TokenStream};
 
 #[derive(Clone, Debug, PartialEq, Hash)]
 pub enum FieldType<'a> {
@@ -167,8 +167,8 @@ impl<'a> ::std::convert::From<&'a introspection_response::InputValueType> for Fi
 #[cfg(test)]
 mod tests {
     use super::*;
-    use graphql_parser::schema::Type as GqlParserType;
     use crate::introspection_response::{FullTypeFieldsType, TypeRef, __TypeKind};
+    use graphql_parser::schema::Type as GqlParserType;
 
     #[test]
     fn field_type_from_graphql_parser_schema_type_works() {
diff --git a/graphql_client_codegen/src/fragments.rs b/graphql_client_codegen/src/fragments.rs
@@ -1,6 +1,6 @@
-use proc_macro2::TokenStream;
 use crate::query::QueryContext;
 use crate::selection::Selection;
+use proc_macro2::TokenStream;
 use std::cell::Cell;
 
 /// Represents which type a fragment is defined on. This is the type mentioned in the fragment's `on` clause.
@@ -36,7 +36,10 @@ pub(crate) struct GqlFragment<'query> {
 
 impl<'query> GqlFragment<'query> {
     /// Generate all the Rust code required by the fragment's object selection.
-    pub(crate) fn to_rust(&self, context: &QueryContext<'_, '_>) -> Result<TokenStream, ::failure::Error> {
+    pub(crate) fn to_rust(
+        &self,
+        context: &QueryContext<'_, '_>,
+    ) -> Result<TokenStream, ::failure::Error> {
         match self.on {
             FragmentTarget::Object(obj) => {
                 obj.response_for_selection(context, &self.selection, &self.name)
diff --git a/graphql_client_codegen/src/inputs.rs b/graphql_client_codegen/src/inputs.rs
@@ -1,12 +1,12 @@
 use crate::deprecation::DeprecationStatus;
-use failure;
-use graphql_parser;
-use heck::SnakeCase;
 use crate::introspection_response;
 use crate::objects::GqlObjectField;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::schema::Schema;
+use failure;
+use graphql_parser;
+use heck::SnakeCase;
+use proc_macro2::{Ident, Span, TokenStream};
 use std::cell::Cell;
 use std::collections::HashMap;
 
@@ -30,7 +30,11 @@ impl<'schema> GqlInput<'schema> {
         })
     }
 
-    fn contains_type_without_indirection(&self, context: &QueryContext<'_, '_>, type_name: &str) -> bool {
+    fn contains_type_without_indirection(
+        &self,
+        context: &QueryContext<'_, '_>,
+        type_name: &str,
+    ) -> bool {
         // the input type is recursive if any of its members contains it, without indirection
         self.fields.values().any(|field| {
             // the field is indirected, so no boxing is needed
@@ -60,7 +64,10 @@ impl<'schema> GqlInput<'schema> {
         self.contains_type_without_indirection(context, &self.name)
     }
 
-    pub(crate) fn to_rust(&self, context: &QueryContext<'_, '_>) -> Result<TokenStream, failure::Error> {
+    pub(crate) fn to_rust(
+        &self,
+        context: &QueryContext<'_, '_>,
+    ) -> Result<TokenStream, failure::Error> {
         let name = Ident::new(&self.name, Span::call_site());
         let mut fields: Vec<&GqlObjectField<'_>> = self.fields.values().collect();
         fields.sort_unstable_by(|a, b| a.name.cmp(&b.name));
diff --git a/graphql_client_codegen/src/interfaces.rs b/graphql_client_codegen/src/interfaces.rs
@@ -1,13 +1,13 @@
 use crate::constants::TYPENAME_FIELD;
-use failure;
 use crate::objects::GqlObjectField;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::selection::{Selection, SelectionField, SelectionFragmentSpread, SelectionItem};
 use crate::shared::*;
+use crate::unions::union_variants;
+use failure;
+use proc_macro2::{Ident, Span, TokenStream};
 use std::cell::Cell;
 use std::collections::HashSet;
-use crate::unions::union_variants;
 
 /// A GraphQL interface (simplified schema representation).
 ///
@@ -218,11 +218,12 @@ mod tests {
         let schema = crate::schema::Schema::new();
         let context = QueryContext::new_empty(&schema);
 
-        let typename_field = crate::selection::SelectionItem::Field(crate::selection::SelectionField {
-            alias: None,
-            name: "__typename",
-            fields: Selection::new_empty(),
-        });
+        let typename_field =
+            crate::selection::SelectionItem::Field(crate::selection::SelectionField {
+                alias: None,
+                name: "__typename",
+                fields: Selection::new_empty(),
+            });
         let selection = Selection::from_vec(vec![typename_field.clone()]);
 
         assert_eq!(
@@ -245,11 +246,12 @@ mod tests {
         let schema = crate::schema::Schema::new();
         let context = QueryContext::new_empty(&schema);
 
-        let typename_field = crate::selection::SelectionItem::Field(crate::selection::SelectionField {
-            alias: None,
-            name: "__typename",
-            fields: Selection::new_empty(),
-        });
+        let typename_field =
+            crate::selection::SelectionItem::Field(crate::selection::SelectionField {
+                alias: None,
+                name: "__typename",
+                fields: Selection::new_empty(),
+            });
         let selection: Selection<'_> = vec![typename_field].into_iter().collect();
 
         assert_eq!(
diff --git a/graphql_client_codegen/src/lib.rs b/graphql_client_codegen/src/lib.rs
@@ -16,7 +16,6 @@ use proc_macro2;
 #[macro_use]
 extern crate serde_derive;
 
-
 #[macro_use]
 extern crate quote;
 
diff --git a/graphql_client_codegen/src/objects.rs b/graphql_client_codegen/src/objects.rs
@@ -1,13 +1,13 @@
 use crate::constants::*;
 use crate::deprecation::DeprecationStatus;
-use failure;
 use crate::field_type::FieldType;
-use graphql_parser::schema;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::schema::Schema;
 use crate::selection::*;
 use crate::shared::{field_impls_for_selection, response_fields_for_selection};
+use failure;
+use graphql_parser::schema;
+use proc_macro2::{Ident, Span, TokenStream};
 use std::cell::Cell;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -81,7 +81,9 @@ impl<'schema> GqlObject<'schema> {
         item
     }
 
-    pub fn from_introspected_schema_json(obj: &'schema crate::introspection_response::FullType) -> Self {
+    pub fn from_introspected_schema_json(
+        obj: &'schema crate::introspection_response::FullType,
+    ) -> Self {
         let description = obj.description.as_ref().map(|s| s.as_str());
         let mut item = GqlObject::new(obj.name.as_ref().expect("missing object name"), description);
         let fields = obj.fields.as_ref().unwrap().iter().filter_map(|t| {
diff --git a/graphql_client_codegen/src/operations.rs b/graphql_client_codegen/src/operations.rs
@@ -1,11 +1,11 @@
 use crate::constants::*;
+use crate::query::QueryContext;
+use crate::selection::Selection;
+use crate::variables::Variable;
 use graphql_parser::query::OperationDefinition;
 use heck::SnakeCase;
 use proc_macro2::{Span, TokenStream};
-use crate::query::QueryContext;
-use crate::selection::Selection;
 use syn::Ident;
-use crate::variables::Variable;
 
 #[derive(Debug, Clone)]
 pub enum OperationType {
@@ -23,7 +23,10 @@ pub struct Operation<'query> {
 }
 
 impl<'query> Operation<'query> {
-    pub(crate) fn root_name<'schema>(&self, schema: &'schema crate::schema::Schema<'_>) -> &'schema str {
+    pub(crate) fn root_name<'schema>(
+        &self,
+        schema: &'schema crate::schema::Schema<'_>,
+    ) -> &'schema str {
         match self.operation_type {
             OperationType::Query => schema.query_type.unwrap_or("Query"),
             OperationType::Mutation => schema.mutation_type.unwrap_or("Mutation"),
diff --git a/graphql_client_codegen/src/query.rs b/graphql_client_codegen/src/query.rs
@@ -1,10 +1,10 @@
 use crate::deprecation::DeprecationStrategy;
-use failure;
 use crate::fragments::GqlFragment;
-use proc_macro2::Span;
-use proc_macro2::TokenStream;
 use crate::schema::Schema;
 use crate::selection::Selection;
+use failure;
+use proc_macro2::Span;
+use proc_macro2::TokenStream;
 use std::collections::{BTreeMap, BTreeSet};
 use syn::Ident;
 
diff --git a/graphql_client_codegen/src/schema.rs b/graphql_client_codegen/src/schema.rs
@@ -1,14 +1,14 @@
 use crate::deprecation::DeprecationStatus;
 use crate::enums::{EnumVariant, GqlEnum};
-use failure;
 use crate::field_type::FieldType;
-use graphql_parser::{self, schema};
 use crate::inputs::GqlInput;
 use crate::interfaces::GqlInterface;
 use crate::objects::{GqlObject, GqlObjectField};
 use crate::scalars::Scalar;
-use std::collections::{BTreeMap, BTreeSet};
 use crate::unions::GqlUnion;
+use failure;
+use graphql_parser::{self, schema};
+use std::collections::{BTreeMap, BTreeSet};
 
 pub(crate) const DEFAULT_SCALARS: &[&str] = &["ID", "String", "Int", "Float", "Boolean"];
 
diff --git a/graphql_client_codegen/src/shared.rs b/graphql_client_codegen/src/shared.rs
@@ -1,10 +1,10 @@
 use crate::deprecation::{DeprecationStatus, DeprecationStrategy};
-use failure;
-use heck::{CamelCase, SnakeCase};
 use crate::objects::GqlObjectField;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::selection::*;
+use failure;
+use heck::{CamelCase, SnakeCase};
+use proc_macro2::{Ident, Span, TokenStream};
 
 pub(crate) fn render_object_field(
     field_name: &str,
diff --git a/graphql_client_codegen/src/tests/github.rs b/graphql_client_codegen/src/tests/github.rs
@@ -1,5 +1,5 @@
-use graphql_parser;
 use crate::schema::Schema;
+use graphql_parser;
 use serde_json;
 use std::collections::HashSet;
 
diff --git a/graphql_client_codegen/src/unions.rs b/graphql_client_codegen/src/unions.rs
@@ -1,7 +1,7 @@
-use failure;
-use proc_macro2::{Ident, Span, TokenStream};
 use crate::query::QueryContext;
 use crate::selection::Selection;
+use failure;
+use proc_macro2::{Ident, Span, TokenStream};
 use std::cell::Cell;
 use std::collections::BTreeSet;
 
diff --git a/graphql_client_codegen/src/variables.rs b/graphql_client_codegen/src/variables.rs
@@ -1,7 +1,7 @@
 use crate::field_type::FieldType;
+use crate::query::QueryContext;
 use graphql_parser;
 use proc_macro2::{Ident, Span, TokenStream};
-use crate::query::QueryContext;
 use std::collections::BTreeMap;
 
 #[derive(Debug, Clone)]
@@ -12,7 +12,10 @@ pub struct Variable<'query> {
 }
 
 impl<'query> Variable<'query> {
-    pub(crate) fn generate_default_value_constructor(&self, context: &QueryContext<'_, '_>) -> TokenStream {
+    pub(crate) fn generate_default_value_constructor(
+        &self,
+        context: &QueryContext<'_, '_>,
+    ) -> TokenStream {
         context.schema.require(&self.ty.inner_name_str());
         match &self.default {
             Some(default) => {
