Merge pull request #194 from h-michael/rust-fmt

tomhoule · web-flow · commit de9ba638dd03 · 2018-12-18T18:25:20.000+01:00
execute rustfmt and fix clippy attr
diff --git a/graphql_client/examples/github/src/main.rs b/graphql_client/examples/github/src/main.rs
@@ -24,7 +24,7 @@ type URI = String;
 #[graphql(
     schema_path = "src/schema.graphql",
     query_path = "src/query_1.graphql",
-    response_derives = "Debug",
+    response_derives = "Debug"
 )]
 struct RepoView;
 
diff --git a/graphql_client/tests/deprecation.rs b/graphql_client/tests/deprecation.rs
@@ -8,23 +8,23 @@ extern crate serde_derive;
 #[graphql(
     schema_path = "tests/deprecation/schema.graphql",
     query_path = "tests/deprecation/query.graphql",
-    deprecated = "allow",
+    deprecated = "allow"
 )]
 pub struct AllowDeprecation;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "tests/deprecation/schema.graphql",
     query_path = "tests/deprecation/query.graphql",
-    deprecated = "deny",
+    deprecated = "deny"
 )]
 pub struct DenyDeprecation;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "tests/deprecation/schema.graphql",
     query_path = "tests/deprecation/query.graphql",
-    deprecated = "warn",
+    deprecated = "warn"
 )]
 pub struct WarnDeprecation;
 
diff --git a/graphql_client/tests/input_object_variables.rs b/graphql_client/tests/input_object_variables.rs
@@ -9,7 +9,7 @@ extern crate serde_json;
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug",
+    response_derives = "Debug"
 )]
 pub struct InputObjectVariablesQuery;
 
@@ -34,7 +34,7 @@ type Email = String;
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query_defaults.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug",
+    response_derives = "Debug"
 )]
 pub struct DefaultInputObjectVariablesQuery;
 
diff --git a/graphql_client/tests/more_derives.rs b/graphql_client/tests/more_derives.rs
@@ -8,7 +8,7 @@ extern crate serde_derive;
 #[graphql(
     schema_path = "tests/more_derives/schema.graphql",
     query_path = "tests/more_derives/query.graphql",
-    response_derives = "Debug, PartialEq, PartialOrd",
+    response_derives = "Debug, PartialEq, PartialOrd"
 )]
 pub struct MoreDerives;
 
diff --git a/graphql_client/tests/union_query.rs b/graphql_client/tests/union_query.rs
@@ -11,7 +11,7 @@ const RESPONSE: &'static str = include_str!("unions/union_query_response.json");
 #[graphql(
     query_path = "tests/unions/union_query.graphql",
     schema_path = "tests/unions/union_schema.graphql",
-    response_derives = "PartialEq, Debug",
+    response_derives = "PartialEq, Debug"
 )]
 pub struct UnionQuery;
 
diff --git a/graphql_client_cli/src/generate.rs b/graphql_client_cli/src/generate.rs
@@ -5,7 +5,7 @@ use std::io::Write as IoWrite;
 use std::path::PathBuf;
 use syn;
 
-#[allow(too_many_arguments)]
+#[allow(clippy::too_many_arguments)]
 pub fn generate_code(
     query_path: PathBuf,
     schema_path: PathBuf,
@@ -29,11 +29,13 @@ pub fn generate_code(
     let module_visibility = match module_visibility {
         Some("pub") => syn::VisPublic {
             pub_token: <Token![pub]>::default(),
-        }.into(),
+        }
+        .into(),
         Some("private") => syn::Visibility::Inherited {},
         _ => syn::VisPublic {
             pub_token: <Token![pub]>::default(),
-        }.into(),
+        }
+        .into(),
     };
 
     let options = GraphQLClientDeriveOptions {
diff --git a/graphql_client_codegen/src/codegen.rs b/graphql_client_codegen/src/codegen.rs
@@ -116,7 +116,8 @@ pub fn response_for_query(
             } else {
                 None
             }
-        }).collect();
+        })
+        .collect();
     let fragment_definitions = fragment_definitions?;
     let variables_struct =
         operation.expand_variables(&context, &operation.name, multiple_operation);
@@ -131,7 +132,8 @@ pub fn response_for_query(
             } else {
                 None
             }
-        }).collect();
+        })
+        .collect();
     let input_object_definitions = input_object_definitions?;
 
     let scalar_definitions: Vec<TokenStream> = context
@@ -144,7 +146,8 @@ pub fn response_for_query(
             } else {
                 None
             }
-        }).collect();
+        })
+        .collect();
 
     let response_derives = context.response_derives();
 
diff --git a/graphql_client_codegen/src/enums.rs b/graphql_client_codegen/src/enums.rs
@@ -28,7 +28,8 @@ impl GqlEnum {
                 let description = &v.description;
                 let description = description.as_ref().map(|d| quote!(#[doc = #d]));
                 quote!(#description #name)
-            }).collect();
+            })
+            .collect();
         let variant_names = &variant_names;
         let name_ident = Ident::new(&format!("{}{}", ENUMS_PREFIX, self.name), Span::call_site());
         let constructors: Vec<_> = self
@@ -37,7 +38,8 @@ impl GqlEnum {
             .map(|v| {
                 let v = Ident::new(&v.name, Span::call_site());
                 quote!(#name_ident::#v)
-            }).collect();
+            })
+            .collect();
         let constructors = &constructors;
         let variant_str: Vec<&str> = self.variants.iter().map(|v| v.name.as_str()).collect();
         let variant_str = &variant_str;
diff --git a/graphql_client_codegen/src/fragments.rs b/graphql_client_codegen/src/fragments.rs
@@ -41,7 +41,7 @@ impl GqlFragment {
             );
         };
 
-        Ok(quote!{
+        Ok(quote! {
             #derives
             pub struct #name_ident {
                 #(#fields,)*
diff --git a/graphql_client_codegen/src/inputs.rs b/graphql_client_codegen/src/inputs.rs
@@ -72,7 +72,8 @@ impl ::std::convert::From<graphql_parser::schema::InputObjectType> for GqlInput
                         deprecation: DeprecationStatus::Current,
                     };
                     (name, field)
-                }).collect(),
+                })
+                .collect(),
             is_required: false.into(),
         }
     }
@@ -101,7 +102,8 @@ impl ::std::convert::From<introspection_response::FullType> for GqlInput {
                         deprecation: DeprecationStatus::Current,
                     };
                     (name, field)
-                }).collect(),
+                })
+                .collect(),
             is_required: false.into(),
         }
     }
@@ -148,7 +150,8 @@ mod tests {
                         deprecation: DeprecationStatus::Current,
                     },
                 ),
-            ].into_iter()
+            ]
+            .into_iter()
             .collect(),
             is_required: false.into(),
         };
@@ -161,7 +164,8 @@ mod tests {
             "pub paws_count : Float , ",
             "pub requirements : Option < CatRequirements > , ",
             "}",
-        ].into_iter()
+        ]
+        .into_iter()
         .collect();
 
         let mut context = QueryContext::new_empty();
diff --git a/graphql_client_codegen/src/interfaces.rs b/graphql_client_codegen/src/interfaces.rs
@@ -47,7 +47,8 @@ impl GqlInterface {
                         fragment.on == self.name
                     }
                     SelectionItem::InlineFragment(_) => false,
-                }).map(|a| (*a).clone())
+                })
+                .map(|a| (*a).clone())
                 .collect(),
         )
     }
@@ -72,7 +73,8 @@ impl GqlInterface {
                         fragment.on != self.name
                     }
                     SelectionItem::Field(SelectionField { name, .. }) => name == "__typename",
-                }).map(|a| (*a).clone())
+                })
+                .map(|a| (*a).clone())
                 .collect(),
         )
     }
diff --git a/graphql_client_codegen/src/query.rs b/graphql_client_codegen/src/query.rs
@@ -119,7 +119,8 @@ impl QueryContext {
             .filter(|derive| {
                 !derive.to_string().contains("erialize")
                     && !derive.to_string().contains("Deserialize")
-            }).collect();
+            })
+            .collect();
 
         if !enum_derives.is_empty() {
             quote! {
@@ -173,11 +174,9 @@ mod tests {
     fn response_derives_fails_when_called_twice() {
         let mut context = QueryContext::new_empty();
 
-        assert!(
-            context
-                .ingest_additional_derives("PartialEq, PartialOrd")
-                .is_ok()
-        );
+        assert!(context
+            .ingest_additional_derives("PartialEq, PartialOrd")
+            .is_ok());
         assert!(context.ingest_additional_derives("Serialize").is_err());
     }
 }
diff --git a/graphql_client_codegen/src/schema.rs b/graphql_client_codegen/src/schema.rs
@@ -54,7 +54,8 @@ impl Schema {
                     .ok_or_else(|| format_err!("interface not found: {}", iface_name))?;
                 iface.implemented_by = implementors.into_iter().collect();
                 Ok(())
-            }).collect()
+            })
+            .collect()
     }
 
     pub(crate) fn require(&self, typename_: &str) {
@@ -66,12 +67,14 @@ impl Schema {
                 self.enums
                     .get(typename_)
                     .map(|enm| enm.is_required.set(true))
-            }).or_else(|| self.inputs.get(typename_).map(|input| input.require(self)))
+            })
+            .or_else(|| self.inputs.get(typename_).map(|input| input.require(self)))
             .or_else(|| {
                 self.objects
                     .get(typename_)
                     .map(|object| object.require(self))
-            }).or_else(|| {
+            })
+            .or_else(|| {
                 self.scalars
                     .get(typename_)
                     .map(|scalar| scalar.is_required.set(true))
@@ -115,7 +118,8 @@ impl ::std::convert::From<graphql_parser::schema::Document> for Schema {
                                     .map(|v| EnumVariant {
                                         description: v.description.clone(),
                                         name: v.name.clone(),
-                                    }).collect(),
+                                    })
+                                    .collect(),
                                 is_required: false.into(),
                             },
                         );
@@ -215,7 +219,8 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
                                 description: t.description,
                                 name: t.name.expect("enum variant name"),
                             })
-                        }).filter_map(|t| t)
+                        })
+                        .filter_map(|t| t)
                         .collect();
                     let mut enm = GqlEnum {
                         name: name.clone(),
diff --git a/graphql_client_codegen/src/selection.rs b/graphql_client_codegen/src/selection.rs
@@ -118,7 +118,8 @@ mod tests {
                 } else {
                     None
                 }
-            }).next()
+            })
+            .next()
             .unwrap();
 
         let selection: Selection = selection_set.into();
diff --git a/graphql_client_codegen/src/shared.rs b/graphql_client_codegen/src/shared.rs
@@ -87,7 +87,8 @@ pub(crate) fn field_impls_for_selection(
             } else {
                 Ok(quote!())
             }
-        }).collect()
+        })
+        .collect()
 }
 
 pub(crate) fn response_fields_for_selection(
@@ -137,20 +138,22 @@ pub(crate) fn response_fields_for_selection(
                     Ident::new(&fragment.fragment_name.to_snake_case(), Span::call_site());
                 context.require(&fragment.fragment_name);
                 let type_name = Ident::new(&fragment.fragment_name, Span::call_site());
-                Ok(quote!{
+                Ok(quote! {
                     #[serde(flatten)]
                     pub #field_name: #type_name
                 })
             }
             SelectionItem::InlineFragment(_) => Err(format_err!(
                 "unimplemented: inline fragment on object field"
             ))?,
-        }).filter(|x| match x {
+        })
+        .filter(|x| match x {
             // Remove empty fields so callers always know a field has some
             // tokens.
             Ok(f) => !f.is_empty(),
             Err(_) => true,
-        }).collect()
+        })
+        .collect()
 }
 
 /// Given the GraphQL schema name for an object/interface/input object field and
diff --git a/graphql_client_codegen/src/unions.rs b/graphql_client_codegen/src/unions.rs
@@ -18,10 +18,7 @@ pub struct GqlUnion {
 enum UnionError {
     #[fail(display = "Unknown type: {}", ty)]
     UnknownType { ty: String },
-    #[fail(
-        display = "Missing __typename in selection for {}",
-        union_name
-    )]
+    #[fail(display = "Missing __typename in selection for {}", union_name)]
     MissingTypename { union_name: String },
 }
 
@@ -45,7 +42,8 @@ pub(crate) fn union_variants(
             } else {
                 true
             }
-        }).map(|item| {
+        })
+        .map(|item| {
             let (on, fields) = match item {
                 SelectionItem::Field(_) => Err(format_err!("field selection on union"))?,
                 SelectionItem::FragmentSpread(SelectionFragmentSpread { fragment_name }) => {
@@ -89,7 +87,8 @@ pub(crate) fn union_variants(
             Ok(quote! {
                 #variant_name(#variant_type)
             })
-        }).collect();
+        })
+        .collect();
 
     let variants = variants?;
 
@@ -127,7 +126,7 @@ impl GqlUnion {
                 }),
         );
 
-        Ok(quote!{
+        Ok(quote! {
             #(#children_definitions)*
 
             #derives
diff --git a/graphql_client_codegen/src/variables.rs b/graphql_client_codegen/src/variables.rs
