Merge branch 'master' into add-prettier

Author: tomhoule

.travis.yml

@@ -11,7 +11,7 @@ before_script:
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (rustup component add rustfmt-preview clippy-preview) fi
 script:
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (cargo fmt --all -- --check) fi
-  - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (cargo clippy) fi
+  - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (cargo clippy -- -D warnings) fi
   - prettier --debug-check -l './**/*.json' './**/*.graphql'
   - cargo test --all
   - cargo build --manifest-path=./graphql_client/examples/github/Cargo.toml

CHANGELOG.md

@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - (BREAKING) GraphQLQuery does not take a lifetime parameter anymore. This makes it easier to work with futures in async client, since futures expect everything they capture to have the 'static lifetime.
 
+### Fixed
+
+- When using edition 2018, you no longer need to add `#[macro_use] extern crate serde_derive` to your crate for the generated modules to compile (thanks @aergonaut!)
+
 ## 0.5.1 (2018-10-07)
 
 ### Added

graphql_client/examples/github/src/main.rs

@@ -2,7 +2,6 @@ extern crate dotenv;
 extern crate envy;
 #[macro_use]
 extern crate failure;
-#[macro_use]
 extern crate graphql_client;
 #[macro_use]
 extern crate log;
@@ -12,7 +11,6 @@ extern crate serde;
 extern crate serde_json;
 #[macro_use]
 extern crate serde_derive;
-#[macro_use]
 extern crate structopt;
 #[macro_use]
 extern crate prettytable;
@@ -42,7 +40,7 @@ struct Env {
 }
 
 fn parse_repo_name(repo_name: &str) -> Result<(&str, &str), failure::Error> {
-    let mut parts = repo_name.split("/");
+    let mut parts = repo_name.split('/');
     match (parts.next(), parts.next()) {
         (Some(owner), Some(name)) => Ok((owner, name)),
         _ => Err(format_err!("wrong format for the repository name param (we expect something like facebook/graphql)"))

graphql_client_cli/Cargo.toml

@@ -18,6 +18,7 @@ structopt = "0.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+syn = "0.15"
 
 rustfmt-nightly = { version = "0.99" , optional = true }
 

graphql_client_cli/src/generate.rs

@@ -3,15 +3,18 @@ use graphql_client_codegen::*;
 use std::fs::File;
 use std::io::Write as IoWrite;
 use std::path::PathBuf;
+use syn;
 
+#[allow(too_many_arguments)]
 pub fn generate_code(
     query_path: PathBuf,
     schema_path: PathBuf,
     selected_operation: String,
     additional_derives: Option<String>,
-    deprecation_strategy: Option<String>,
+    deprecation_strategy: &Option<String>,
     no_formatting: bool,
-    output: PathBuf,
+    module_visibility: &Option<String>,
+    output: &PathBuf,
 ) -> Result<(), failure::Error> {
     let deprecation_strategy = deprecation_strategy.as_ref().map(|s| s.as_str());
     let deprecation_strategy = match deprecation_strategy {
@@ -21,10 +24,22 @@ pub fn generate_code(
         _ => None,
     };
 
+    let module_visibility = module_visibility.as_ref().map(|s| s.as_str());
+    let module_visibility = match module_visibility {
+        Some("pub") => syn::VisPublic {
+            pub_token: <Token![pub]>::default(),
+        }.into(),
+        Some("private") => syn::Visibility::Inherited {},
+        _ => syn::VisPublic {
+            pub_token: <Token![pub]>::default(),
+        }.into(),
+    };
+
     let options = GraphQLClientDeriveOptions {
         struct_name: selected_operation,
         additional_derives,
         deprecation_strategy,
+        module_visibility,
     };
 
     let gen = generate_module_token_stream(query_path, schema_path, Some(options))?;

graphql_client_cli/src/introspect_schema.rs

@@ -49,7 +49,8 @@ pub fn introspect_schema(
     }
 
     let json: serde_json::Value = res.json()?;
-    Ok(serde_json::to_writer_pretty(out, &json)?)
+    serde_json::to_writer_pretty(out, &json)?;
+    Ok(())
 }
 
 fn construct_headers() -> HeaderMap {

graphql_client_cli/src/main.rs

@@ -1,7 +1,5 @@
 extern crate failure;
 extern crate reqwest;
-
-#[macro_use]
 extern crate structopt;
 #[macro_use]
 extern crate graphql_client;
@@ -10,6 +8,8 @@ extern crate graphql_client_codegen;
 extern crate serde_derive;
 extern crate serde;
 extern crate serde_json;
+#[macro_use]
+extern crate syn;
 
 #[cfg(feature = "rustfmt")]
 extern crate rustfmt_nightly as rustfmt;
@@ -57,6 +57,10 @@ enum Cli {
         /// Formating feature is disabled as default installation.
         #[structopt(long = "no-formatting")]
         no_formatting: bool,
+        /// You can choose module and target struct visibility from pub and private.
+        /// Default value is pub.
+        #[structopt(short = "m", long = "module_visibility")]
+        module_visibility: Option<String>,
         #[structopt(parse(from_os_str))]
         output: PathBuf,
     },
@@ -77,15 +81,17 @@ fn main() -> Result<(), failure::Error> {
             additional_derives,
             deprecation_strategy,
             no_formatting,
+            module_visibility,
             output,
         } => generate::generate_code(
             query_path,
             schema_path,
             selected_operation,
             additional_derives,
-            deprecation_strategy,
+            &deprecation_strategy,
             no_formatting,
-            output,
+            &module_visibility,
+            &output,
         ),
     }
 }

graphql_client_codegen/src/codegen.rs

@@ -12,12 +12,9 @@ use selection::Selection;
 pub(crate) fn select_operation(query: &query::Document, struct_name: &str) -> Option<Operation> {
     let mut operations: Vec<Operation> = Vec::new();
 
-    for definition in query.definitions.iter() {
-        match definition {
-            query::Definition::Operation(op) => {
-                operations.push(op.into());
-            }
-            _ => (),
+    for definition in &query.definitions {
+        if let query::Definition::Operation(op) = definition {
+            operations.push(op.into());
         }
     }
 
@@ -145,6 +142,8 @@ pub fn response_for_query(
     let response_derives = context.response_derives();
 
     Ok(quote! {
+        use serde_derive::*;
+
         #[allow(dead_code)]
         type Boolean = bool;
         #[allow(dead_code)]

graphql_client_codegen/src/lib.rs

@@ -23,6 +23,7 @@ extern crate syn;
 extern crate quote;
 
 use proc_macro2::TokenStream;
+use syn::Visibility;
 
 /// Derive-related code. This will be moved into graphql_query_derive.
 pub mod attributes;
@@ -71,6 +72,8 @@ pub struct GraphQLClientDeriveOptions {
     pub additional_derives: Option<String>,
     /// The deprecation strategy to adopt.
     pub deprecation_strategy: Option<deprecation::DeprecationStrategy>,
+    /// target struct visibility.
+    pub module_visibility: Visibility,
 }
 
 /// Generates the code for a Rust module given a query, a schema and options.
@@ -81,12 +84,11 @@ pub fn generate_module_token_stream(
 ) -> Result<TokenStream, failure::Error> {
     let options = options.unwrap();
 
+    let module_visibility = options.module_visibility;
     let response_derives = options.additional_derives;
 
     // The user can determine what to do about deprecations.
-    let deprecation_strategy = options
-        .deprecation_strategy
-        .unwrap_or(deprecation::DeprecationStrategy::default());
+    let deprecation_strategy = options.deprecation_strategy.unwrap_or_default();
 
     // We need to qualify the query with the path to the crate it is part of
     let (query_string, query) = {
@@ -157,7 +159,7 @@ pub fn generate_module_token_stream(
     )?;
 
     let result = quote!(
-        pub mod #module_name {
+        #module_visibility mod #module_name {
             #![allow(non_camel_case_types)]
             #![allow(non_snake_case)]
             #![allow(dead_code)]

graphql_client_codegen/src/query.rs

@@ -31,9 +31,9 @@ impl QueryContext {
     }
 
     pub(crate) fn require(&self, typename_: &str) {
-        self.fragments
-            .get(typename_)
-            .map(|fragment| fragment.is_required.set(true));
+        if let Some(fragment) = self.fragments.get(typename_) {
+            fragment.is_required.set(true)
+        }
     }
 
     /// For testing only. creates an empty QueryContext with an empty Schema.
@@ -121,7 +121,7 @@ impl QueryContext {
                     && !derive.to_string().contains("Deserialize")
             }).collect();
 
-        if enum_derives.len() > 0 {
+        if !enum_derives.is_empty() {
             quote! {
                 #[derive( #(#enum_derives),* )]
             }