Merge remote-tracking branch 'upstream/master' into code-gen

Author: h-michael

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;

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,6 +3,7 @@ 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(
@@ -13,6 +14,7 @@ pub fn generate_code(
     additional_derives: Option<String>,
     deprecation_strategy: &Option<String>,
     no_formatting: bool,
+    module_visibility: &Option<String>,
     output: &PathBuf,
 ) -> Result<(), failure::Error> {
     let deprecation_strategy = deprecation_strategy.as_ref().map(|s| s.as_str());
@@ -23,12 +25,24 @@ 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 {
         operation_name: selected_operation,
         struct_name: None,
         module_name: Some(module_name),
         additional_derives,
         deprecation_strategy,
+        module_visibility,
     };
 
     let gen = generate_module_token_stream(query_path, schema_path, Some(options))?;

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;
@@ -60,6 +60,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,
     },
@@ -81,6 +85,7 @@ fn main() -> Result<(), failure::Error> {
             additional_derives,
             deprecation_strategy,
             no_formatting,
+            module_visibility,
             output,
         } => generate::generate_code(
             query_path,
@@ -90,6 +95,7 @@ fn main() -> Result<(), failure::Error> {
             additional_derives,
             &deprecation_strategy,
             no_formatting,
+            &module_visibility,
             &output,
         ),
     }

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;
@@ -76,6 +77,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.
@@ -86,6 +89,7 @@ pub fn generate_module_token_stream(
 ) -> Result<TokenStream, failure::Error> {
     let options = options.unwrap();
 
+    let module_visibility = options.module_visibility.clone();
     let response_derives = options.additional_derives.clone();
 
     // The user can determine what to do about deprecations.
@@ -187,6 +191,7 @@ pub fn generate_module_token_stream(
     }
 
     let result = build_module_token_stream(
+        module_visibility,
         &module_name,
         &struct_name,
         &query_string,
@@ -197,6 +202,7 @@ pub fn generate_module_token_stream(
 }
 
 fn build_module_token_stream(
+    module_visibility: syn::Visibility,
     module_name: &Ident,
     struct_name: &Option<Ident>,
     query_string: &str,
@@ -219,6 +225,7 @@ fn build_module_token_stream(
     }
 
     merge_with_common_token_stream(
+        module_visibility,
         &module_name,
         query_string,
         schema_token_streams,
@@ -227,13 +234,14 @@ fn build_module_token_stream(
 }
 
 fn merge_with_common_token_stream(
+    module_visibility: syn::Visibility,
     module_name: &Ident,
     query_string: &str,
     schema_token_streams: Vec<TokenStream>,
     trait_token_streams: Vec<TokenStream>,
 ) -> TokenStream {
     quote!(
-        pub mod #module_name {
+        #module_visibility mod #module_name {
             #![allow(non_camel_case_types)]
             #![allow(non_snake_case)]
             #![allow(dead_code)]

graphql_query_derive/src/lib.rs

@@ -56,5 +56,6 @@ fn build_graphql_client_derive_options(input: &syn::DeriveInput) -> GraphQLClien
         module_name: Some(input.ident.to_string()),
         additional_derives: response_derives,
         deprecation_strategy: Some(deprecation_strategy),
+        module_visibility: input.clone().vis,
     }
 }