Merge pull request #190 from h-michael/2018-edition

Rust 2018

Author: tomhoule

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.8.0
+
+This release is only compatible with Rust 1.31.0 and later.
+
+## 0.7.1
+
 ### Fixed
 
 - In the CLI, both --selected-operation and --output used the -o shorthand. --output now uses -out.

graphql_client/Cargo.toml

@@ -1,22 +1,23 @@
 [package]
 name = "graphql_client"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Tom Houlé <[email protected]>"]
 description = "Typed GraphQL requests and responses"
 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"
-graphql_query_derive = {path = "../graphql_query_derive", version = "0.7.0" }
+graphql_query_derive = {path = "../graphql_query_derive", version = "0.8.0" }
 serde = "^1.0.78"
 serde_derive = "1.0"
 serde_json = "1.0"
 
 [build-dependencies]
-skeptic = "0.13"
+skeptic = "0.13.4"
 
 [dev-dependencies]
-skeptic = "0.13"
+skeptic = "0.13.4"

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;
+#[cfg(test)]
+use serde_json::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/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");
 

graphql_client_cli/Cargo.toml

@@ -1,10 +1,11 @@
 [package]
 name = "graphql_client_cli"
 description = "The CLI for graphql-client"
-version = "0.7.1"
+version = "0.8.0"
 authors = ["Tom Houlé <[email protected]>"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/graphql-rust/graphql-client"
+edition = "2018"
 
 [[bin]]
 name = "graphql-client"
@@ -13,8 +14,8 @@ path = "src/main.rs"
 [dependencies]
 failure = "0.1"
 reqwest = "^0.9.0"
-graphql_client = { version = "0.7.0", path = "../graphql_client" }
-graphql_client_codegen = { path = "../graphql_client_codegen/", version = "0.7.0" }
+graphql_client = { version = "0.8.0", path = "../graphql_client" }
+graphql_client_codegen = { path = "../graphql_client_codegen/", version = "0.8.0" }
 structopt = "0.2"
 serde = "1.0"
 serde_derive = "1.0"

graphql_client_codegen/Cargo.toml

@@ -1,10 +1,11 @@
 [package]
 name = "graphql_client_codegen"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Tom Houlé <[email protected]>"]
 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"

graphql_client_codegen/src/codegen.rs

@@ -1,11 +1,11 @@
+use crate::fragments::GqlFragment;
+use crate::operations::Operation;
+use crate::query::QueryContext;
+use crate::schema;
+use crate::selection::Selection;
 use failure;
-use fragments::GqlFragment;
 use graphql_parser::query;
-use operations::Operation;
 use proc_macro2::TokenStream;
-use query::QueryContext;
-use schema;
-use 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>(
@@ -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,10 +33,10 @@ 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,
-    options: &::GraphQLClientCodegenOptions,
+    operation: &Operation<'_>,
+    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
             ))?
         }
 

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";