cargo fix --edition

h-michael · h-michael · commit 24da4fbab589 · 2019-03-30T16:11:47.000+09:00
diff --git a/graphql_client/Cargo.toml b/graphql_client/Cargo.toml
@@ -7,6 +7,7 @@ repository = "https://github.com/graphql-rust/graphql-client"
 license = "Apache-2.0 OR MIT"
 keywords = ["graphql",  "api", "web", "webassembly", "wasm"]
 categories = ["network-programming", "web-programming", "wasm"]
+edition = "2018"
 
 [dependencies]
 failure = "0.1"
diff --git a/graphql_client/tests/type_refining_fragments.rs b/graphql_client/tests/type_refining_fragments.rs
@@ -52,7 +52,7 @@ fn type_refining_fragment_on_union() {
 
 #[test]
 fn type_refining_fragment_on_interface() {
-    use query_on_interface::*;
+    use crate::query_on_interface::*;
 
     const RESPONSE: &'static str = include_str!("interfaces/interface_response.json");
 
diff --git a/graphql_client_cli/Cargo.toml b/graphql_client_cli/Cargo.toml
@@ -5,6 +5,7 @@ version = "0.7.0"
 authors = ["Tom Houlé <tom@tomhoule.com>"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/graphql-rust/graphql-client"
+edition = "2018"
 
 [[bin]]
 name = "graphql-client"
diff --git a/graphql_client_codegen/Cargo.toml b/graphql_client_codegen/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Tom Houlé <tom@tomhoule.com>"]
 description = "Utility crate for graphql_client"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/graphql-rust/graphql-client"
+edition = "2018"
 
 [dependencies]
 failure = "0.1"
diff --git a/graphql_client_codegen/src/codegen.rs b/graphql_client_codegen/src/codegen.rs
@@ -1,11 +1,11 @@
 use failure;
-use fragments::GqlFragment;
+use crate::fragments::GqlFragment;
 use graphql_parser::query;
-use operations::Operation;
+use crate::operations::Operation;
 use proc_macro2::TokenStream;
-use query::QueryContext;
-use schema;
-use selection::Selection;
+use crate::query::QueryContext;
+use crate::schema;
+use crate::selection::Selection;
 
 /// 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>(
@@ -36,7 +36,7 @@ pub(crate) fn response_for_query(
     schema: &schema::Schema,
     query: &query::Document,
     operation: &Operation,
-    options: &::GraphQLClientCodegenOptions,
+    options: &crate::GraphQLClientCodegenOptions,
 ) -> Result<TokenStream, failure::Error> {
     let mut context = QueryContext::new(schema, options.deprecation_strategy());
 
@@ -88,7 +88,7 @@ pub(crate) fn response_for_query(
         if operation.is_subscription() && selection.len() > 1 {
             Err(format_err!(
                 "{}",
-                ::constants::MULTIPLE_SUBSCRIPTION_FIELDS_ERROR
+                crate::constants::MULTIPLE_SUBSCRIPTION_FIELDS_ERROR
             ))?
         }
 
diff --git a/graphql_client_codegen/src/constants.rs b/graphql_client_codegen/src/constants.rs
@@ -1,6 +1,6 @@
-use deprecation::DeprecationStatus;
-use field_type::FieldType;
-use objects::GqlObjectField;
+use crate::deprecation::DeprecationStatus;
+use crate::field_type::FieldType;
+use crate::objects::GqlObjectField;
 
 pub(crate) const TYPENAME_FIELD: &str = "__typename";
 
diff --git a/graphql_client_codegen/src/enums.rs b/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: &::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 enums::ENUMS_PREFIX;
+use crate::enums::ENUMS_PREFIX;
 use graphql_parser;
-use introspection_response;
+use crate::introspection_response;
 use proc_macro2::{Ident, Span, TokenStream};
-use query::QueryContext;
-use schema::DEFAULT_SCALARS;
+use crate::query::QueryContext;
+use crate::schema::DEFAULT_SCALARS;
 
 #[derive(Clone, Debug, PartialEq, Hash)]
 pub enum FieldType<'a> {
@@ -118,7 +118,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 {
-    use introspection_response::*;
+    use crate::introspection_response::*;
 
     match inner.kind {
         Some(__TypeKind::NON_NULL) => from_json_type_inner(
@@ -168,7 +168,7 @@ impl<'a> ::std::convert::From<&'a introspection_response::InputValueType> for Fi
 mod tests {
     use super::*;
     use graphql_parser::schema::Type as GqlParserType;
-    use introspection_response::{FullTypeFieldsType, TypeRef, __TypeKind};
+    use crate::introspection_response::{FullTypeFieldsType, TypeRef, __TypeKind};
 
     #[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 query::QueryContext;
-use selection::Selection;
+use crate::query::QueryContext;
+use crate::selection::Selection;
 use std::cell::Cell;
 
 /// Represents which type a fragment is defined on. This is the type mentioned in the fragment's `on` clause.
diff --git a/graphql_client_codegen/src/generated_module.rs b/graphql_client_codegen/src/generated_module.rs
@@ -4,17 +4,17 @@ use proc_macro2::{Ident, Span, TokenStream};
 
 /// This struct contains the parameters necessary to generate code for a given operation.
 pub(crate) struct GeneratedModule<'a> {
-    pub operation: &'a ::operations::Operation<'a>,
+    pub operation: &'a crate::operations::Operation<'a>,
     pub query_string: &'a str,
     pub query_document: &'a graphql_parser::query::Document,
-    pub schema: &'a ::schema::Schema<'a>,
+    pub schema: &'a crate::schema::Schema<'a>,
     pub options: &'a crate::GraphQLClientCodegenOptions,
 }
 
 impl<'a> GeneratedModule<'a> {
     /// Generate the items for the variables and the response that will go inside the module.
     fn build_impls(&self) -> Result<TokenStream, failure::Error> {
-        Ok(::codegen::response_for_query(
+        Ok(crate::codegen::response_for_query(
             &self.schema,
             &self.query_document,
             &self.operation,
diff --git a/graphql_client_codegen/src/inputs.rs b/graphql_client_codegen/src/inputs.rs
@@ -1,12 +1,12 @@
-use deprecation::DeprecationStatus;
+use crate::deprecation::DeprecationStatus;
 use failure;
 use graphql_parser;
 use heck::SnakeCase;
-use introspection_response;
-use objects::GqlObjectField;
+use crate::introspection_response;
+use crate::objects::GqlObjectField;
 use proc_macro2::{Ident, Span, TokenStream};
-use query::QueryContext;
-use schema::Schema;
+use crate::query::QueryContext;
+use crate::schema::Schema;
 use std::cell::Cell;
 use std::collections::HashMap;
 
@@ -81,7 +81,7 @@ impl<'schema> GqlInput<'schema> {
             context.schema.require(&field.type_.inner_name_str());
             let original_name = &field.name;
             let snake_case_name = field.name.to_snake_case();
-            let rename = ::shared::field_rename_annotation(&original_name, &snake_case_name);
+            let rename = crate::shared::field_rename_annotation(&original_name, &snake_case_name);
             let name = Ident::new(&snake_case_name, Span::call_site());
 
             quote!(#rename pub #name: #ty)
@@ -169,8 +169,8 @@ impl<'schema> ::std::convert::From<&'schema introspection_response::FullType>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use constants::*;
-    use field_type::FieldType;
+    use crate::constants::*;
+    use crate::field_type::FieldType;
 
     #[test]
     fn gql_input_to_rust() {
@@ -223,7 +223,7 @@ mod tests {
         .into_iter()
         .collect();
 
-        let mut schema = ::schema::Schema::new();
+        let mut schema = crate::schema::Schema::new();
         schema.inputs.insert(cat.name, cat);
         let mut context = QueryContext::new_empty(&schema);
         context.ingest_additional_derives("Clone").unwrap();
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 objects::GqlObjectField;
+use crate::objects::GqlObjectField;
 use proc_macro2::{Ident, Span, TokenStream};
-use query::QueryContext;
-use selection::{Selection, SelectionField, SelectionFragmentSpread, SelectionItem};
-use shared::*;
+use crate::query::QueryContext;
+use crate::selection::{Selection, SelectionField, SelectionFragmentSpread, SelectionItem};
+use crate::shared::*;
 use std::cell::Cell;
 use std::collections::HashSet;
-use unions::union_variants;
+use crate::unions::union_variants;
 
 /// A GraphQL interface (simplified schema representation).
 ///
@@ -104,7 +104,7 @@ impl<'schema> GqlInterface<'schema> {
         selection: &Selection,
         prefix: &str,
     ) -> Result<Vec<TokenStream>, failure::Error> {
-        ::shared::field_impls_for_selection(
+        crate::shared::field_impls_for_selection(
             &self.fields,
             context,
             &self.object_selection(selection, context),
@@ -215,10 +215,10 @@ mod tests {
             is_required: Cell::new(true),
         };
 
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let context = QueryContext::new_empty(&schema);
 
-        let typename_field = ::selection::SelectionItem::Field(::selection::SelectionField {
+        let typename_field = crate::selection::SelectionItem::Field(crate::selection::SelectionField {
             alias: None,
             name: "__typename",
             fields: Selection::new_empty(),
@@ -242,10 +242,10 @@ mod tests {
             is_required: Cell::new(true),
         };
 
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let context = QueryContext::new_empty(&schema);
 
-        let typename_field = ::selection::SelectionItem::Field(::selection::SelectionField {
+        let typename_field = crate::selection::SelectionItem::Field(crate::selection::SelectionField {
             alias: None,
             name: "__typename",
             fields: Selection::new_empty(),
diff --git a/graphql_client_codegen/src/lib.rs b/graphql_client_codegen/src/lib.rs
@@ -50,7 +50,7 @@ mod variables;
 #[cfg(test)]
 mod tests;
 
-pub use codegen_options::{CodegenMode, GraphQLClientCodegenOptions};
+pub use crate::codegen_options::{CodegenMode, GraphQLClientCodegenOptions};
 
 use std::collections::HashMap;
 
diff --git a/graphql_client_codegen/src/objects.rs b/graphql_client_codegen/src/objects.rs
@@ -1,13 +1,13 @@
-use constants::*;
-use deprecation::DeprecationStatus;
+use crate::constants::*;
+use crate::deprecation::DeprecationStatus;
 use failure;
-use field_type::FieldType;
+use crate::field_type::FieldType;
 use graphql_parser::schema;
 use proc_macro2::{Ident, Span, TokenStream};
-use query::QueryContext;
-use schema::Schema;
-use selection::*;
-use shared::{field_impls_for_selection, response_fields_for_selection};
+use crate::query::QueryContext;
+use crate::schema::Schema;
+use crate::selection::*;
+use crate::shared::{field_impls_for_selection, response_fields_for_selection};
 use std::cell::Cell;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -81,7 +81,7 @@ impl<'schema> GqlObject<'schema> {
         item
     }
 
-    pub fn from_introspected_schema_json(obj: &'schema ::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 constants::*;
+use crate::constants::*;
 use graphql_parser::query::OperationDefinition;
 use heck::SnakeCase;
 use proc_macro2::{Span, TokenStream};
-use query::QueryContext;
-use selection::Selection;
+use crate::query::QueryContext;
+use crate::selection::Selection;
 use syn::Ident;
-use variables::Variable;
+use crate::variables::Variable;
 
 #[derive(Debug, Clone)]
 pub enum OperationType {
@@ -23,7 +23,7 @@ pub struct Operation<'query> {
 }
 
 impl<'query> Operation<'query> {
-    pub(crate) fn root_name<'schema>(&self, schema: &'schema ::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"),
@@ -54,7 +54,7 @@ impl<'query> Operation<'query> {
             let name = &variable.name;
             let ty = variable.ty.to_rust(context, "");
             let snake_case_name = name.to_snake_case();
-            let rename = ::shared::field_rename_annotation(&name, &snake_case_name);
+            let rename = crate::shared::field_rename_annotation(&name, &snake_case_name);
             let name = Ident::new(&snake_case_name, Span::call_site());
 
             quote!(#rename pub #name: #ty)
diff --git a/graphql_client_codegen/src/query.rs b/graphql_client_codegen/src/query.rs
@@ -1,10 +1,10 @@
-use deprecation::DeprecationStrategy;
+use crate::deprecation::DeprecationStrategy;
 use failure;
-use fragments::GqlFragment;
+use crate::fragments::GqlFragment;
 use proc_macro2::Span;
 use proc_macro2::TokenStream;
-use schema::Schema;
-use selection::Selection;
+use crate::schema::Schema;
+use crate::selection::Selection;
 use std::collections::{BTreeMap, BTreeSet};
 use syn::Ident;
 
@@ -148,7 +148,7 @@ mod tests {
 
     #[test]
     fn response_derives_ingestion_works() {
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let mut context = QueryContext::new_empty(&schema);
 
         context
@@ -163,7 +163,7 @@ mod tests {
 
     #[test]
     fn response_enum_derives_does_not_produce_empty_list() {
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let context = QueryContext::new_empty(&schema);
         assert_eq!(
             context.response_enum_derives().to_string(),
@@ -173,7 +173,7 @@ mod tests {
 
     #[test]
     fn response_enum_derives_works() {
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let mut context = QueryContext::new_empty(&schema);
 
         context
@@ -188,7 +188,7 @@ mod tests {
 
     #[test]
     fn response_derives_fails_when_called_twice() {
-        let schema = ::schema::Schema::new();
+        let schema = crate::schema::Schema::new();
         let mut context = QueryContext::new_empty(&schema);
 
         assert!(context
diff --git a/graphql_client_codegen/src/schema.rs b/graphql_client_codegen/src/schema.rs
diff --git a/graphql_client_codegen/src/selection.rs b/graphql_client_codegen/src/selection.rs
diff --git a/graphql_client_codegen/src/shared.rs b/graphql_client_codegen/src/shared.rs
diff --git a/graphql_client_codegen/src/tests/github.rs b/graphql_client_codegen/src/tests/github.rs
diff --git a/graphql_client_codegen/src/unions.rs b/graphql_client_codegen/src/unions.rs
diff --git a/graphql_client_codegen/src/variables.rs b/graphql_client_codegen/src/variables.rs
diff --git a/graphql_query_derive/Cargo.toml b/graphql_query_derive/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub struct GqlEnum<'schema> {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`impl<'schema> GqlEnum<'schema> {`
`21`		`- pub(crate) fn to_rust(&self, query_context: &::query::QueryContext) -> TokenStream {`
	`21`	`+ pub(crate) fn to_rust(&self, query_context: &crate::query::QueryContext) -> TokenStream {`
`22`	`22`	`let derives = query_context.response_enum_derives();`
`23`	`23`	`let variant_names: Vec<TokenStream> = self`
`24`	`24`	`.variants`