cargo fix --edition-idioms

Author: h-michael

graphql_client/src/lib.rs

@@ -5,13 +5,13 @@
 #![deny(warnings)]
 #![deny(missing_docs)]
 
-extern crate serde;
+use serde;
 #[macro_use]
 extern crate serde_derive;
-pub extern crate graphql_query_derive;
+pub use graphql_query_derive;
 
 #[cfg_attr(test, macro_use)]
-extern crate serde_json;
+use serde_json;
 
 #[doc(hidden)]
 pub use graphql_query_derive::*;
@@ -111,7 +111,7 @@ pub enum PathFragment {
 }
 
 impl Display for PathFragment {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             PathFragment::Key(ref key) => write!(f, "{}", key),
             PathFragment::Index(ref idx) => write!(f, "{}", idx),
@@ -200,7 +200,7 @@ pub struct Error {
 }
 
 impl Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // Use `/` as a separator like JSON Pointer.
         let path = self
             .path

graphql_client/tests/alias.rs

@@ -1,6 +1,6 @@
 #[macro_use]
 extern crate graphql_client;
-extern crate serde;
+
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]

graphql_client/tests/scalar_variables.rs

@@ -2,8 +2,8 @@
 extern crate graphql_client;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde;
-extern crate serde_json;
+
+use serde_json;
 
 #[derive(GraphQLQuery)]
 #[graphql(

graphql_client_codegen/src/codegen.rs

@@ -20,8 +20,8 @@ pub(crate) fn select_operation<'query>(
         .map(|i| i.to_owned())
 }
 
-pub(crate) fn all_operations(query: &query::Document) -> Vec<Operation> {
-    let mut operations: Vec<Operation> = Vec::new();
+pub(crate) fn all_operations(query: &query::Document) -> Vec<Operation<'_>> {
+    let mut operations: Vec<Operation<'_>> = Vec::new();
 
     for definition in &query.definitions {
         if let query::Definition::Operation(op) = definition {
@@ -33,9 +33,9 @@ pub(crate) fn all_operations(query: &query::Document) -> Vec<Operation> {
 
 /// The main code generation function.
 pub(crate) fn response_for_query(
-    schema: &schema::Schema,
+    schema: &schema::Schema<'_>,
     query: &query::Document,
-    operation: &Operation,
+    operation: &Operation<'_>,
     options: &crate::GraphQLClientCodegenOptions,
 ) -> Result<TokenStream, failure::Error> {
     let mut context = QueryContext::new(schema, options.deprecation_strategy());

graphql_client_codegen/src/enums.rs

@@ -18,7 +18,7 @@ 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

graphql_client_codegen/src/field_type.rs

@@ -14,7 +14,7 @@ pub enum FieldType<'a> {
 
 impl<'a> FieldType<'a> {
     /// Takes a field type with its name
-    pub(crate) fn to_rust(&self, context: &QueryContext, prefix: &str) -> TokenStream {
+    pub(crate) fn to_rust(&self, context: &QueryContext<'_, '_>, prefix: &str) -> TokenStream {
         let prefix: &str = if prefix.is_empty() {
             self.inner_name_str()
         } else {
@@ -94,7 +94,7 @@ impl<'schema> ::std::convert::From<&'schema graphql_parser::schema::Type> for Fi
     }
 }
 
-fn from_schema_type_inner(inner: &graphql_parser::schema::Type, non_null: bool) -> FieldType {
+fn from_schema_type_inner(inner: &graphql_parser::schema::Type, non_null: bool) -> FieldType<'_> {
     match inner {
         graphql_parser::schema::Type::ListType(inner) => {
             let inner = from_schema_type_inner(&*inner, false);
@@ -117,7 +117,7 @@ fn from_schema_type_inner(inner: &graphql_parser::schema::Type, non_null: bool)
     }
 }
 
-fn from_json_type_inner(inner: &introspection_response::TypeRef, non_null: bool) -> FieldType {
+fn from_json_type_inner(inner: &introspection_response::TypeRef, non_null: bool) -> FieldType<'_> {
     use crate::introspection_response::*;
 
     match inner.kind {

graphql_client_codegen/src/fragments.rs

@@ -36,7 +36,7 @@ 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)

graphql_client_codegen/src/inputs.rs

@@ -30,7 +30,7 @@ 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
@@ -56,13 +56,13 @@ impl<'schema> GqlInput<'schema> {
         })
     }
 
-    fn is_recursive_without_indirection(&self, context: &QueryContext) -> bool {
+    fn is_recursive_without_indirection(&self, context: &QueryContext<'_, '_>) -> bool {
         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();
+        let mut fields: Vec<&GqlObjectField<'_>> = self.fields.values().collect();
         fields.sort_unstable_by(|a, b| a.name.cmp(&b.name));
         let fields = fields.iter().map(|field| {
             let ty = field.type_.to_rust(&context, "");

graphql_client_codegen/src/interfaces.rs

@@ -32,7 +32,7 @@ impl<'schema> GqlInterface<'schema> {
     fn object_selection<'query>(
         &self,
         selection: &'query Selection<'query>,
-        query_context: &QueryContext,
+        query_context: &QueryContext<'_, '_>,
     ) -> Selection<'query> {
         (&selection)
             .into_iter()
@@ -58,8 +58,8 @@ impl<'schema> GqlInterface<'schema> {
 
     fn union_selection<'query>(
         &self,
-        selection: &'query Selection,
-        query_context: &QueryContext,
+        selection: &'query Selection<'_>,
+        query_context: &QueryContext<'_, '_>,
     ) -> Selection<'query> {
         (&selection)
             .into_iter()
@@ -100,8 +100,8 @@ impl<'schema> GqlInterface<'schema> {
     /// The generated code for each of the selected field's types. See [shared::field_impls_for_selection].
     pub(crate) fn field_impls_for_selection(
         &self,
-        context: &QueryContext,
-        selection: &Selection,
+        context: &QueryContext<'_, '_>,
+        selection: &Selection<'_>,
         prefix: &str,
     ) -> Result<Vec<TokenStream>, failure::Error> {
         crate::shared::field_impls_for_selection(
@@ -115,8 +115,8 @@ impl<'schema> GqlInterface<'schema> {
     /// The code for the interface's corresponding struct's fields.
     pub(crate) fn response_fields_for_selection(
         &self,
-        context: &QueryContext,
-        selection: &Selection,
+        context: &QueryContext<'_, '_>,
+        selection: &Selection<'_>,
         prefix: &str,
     ) -> Result<Vec<TokenStream>, failure::Error> {
         response_fields_for_selection(
@@ -131,8 +131,8 @@ impl<'schema> GqlInterface<'schema> {
     /// Generate all the code for the interface.
     pub(crate) fn response_for_selection(
         &self,
-        query_context: &QueryContext,
-        selection: &Selection,
+        query_context: &QueryContext<'_, '_>,
+        selection: &Selection<'_>,
         prefix: &str,
     ) -> Result<TokenStream, failure::Error> {
         let name = Ident::new(&prefix, Span::call_site());
@@ -250,7 +250,7 @@ mod tests {
             name: "__typename",
             fields: Selection::new_empty(),
         });
-        let selection: Selection = vec![typename_field].into_iter().collect();
+        let selection: Selection<'_> = vec![typename_field].into_iter().collect();
 
         assert_eq!(
             iface.object_selection(&selection, &context),

graphql_client_codegen/src/lib.rs

@@ -7,17 +7,17 @@
 
 #[macro_use]
 extern crate failure;
-extern crate graphql_parser;
-extern crate heck;
+use graphql_parser;
+
 #[macro_use]
 extern crate lazy_static;
-extern crate proc_macro;
-extern crate proc_macro2;
-extern crate serde;
+
+use proc_macro2;
+use serde;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
-extern crate syn;
+
+
 #[macro_use]
 extern crate quote;