Replace rustfmt_nightly feature in CLI with direct calls to rustfmt

It is opt-out, but it's a reasonable assumption that it will be there

Author: tomhoule

examples/github/Cargo.toml

@@ -11,7 +11,6 @@ serde = "^1.0"
 reqwest = { version = "^0.11", features = ["json", "blocking"] }
 prettytable-rs = "^0.7"
 structopt = "^0.3"
-dotenv = "^0.13"
 envy = "^0.3"
 log = "^0.4"
 env_logger = "^0.5"

examples/github/examples/github.rs

@@ -37,7 +37,6 @@ fn parse_repo_name(repo_name: &str) -> Result<(&str, &str), anyhow::Error> {
 }
 
 fn main() -> Result<(), anyhow::Error> {
-    dotenv::dotenv().ok();
     env_logger::init();
 
     let config: Env = envy::from_env().context("while reading from environment")?;

examples/hasura/Cargo.toml

@@ -7,11 +7,9 @@ edition = "2018"
 [dev-dependencies]
 anyhow = "1.0"
 graphql_client = { path = "../../graphql_client", features = ["reqwest"] }
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 reqwest = { version = "^0.11", features = ["json", "blocking"] }
 prettytable-rs = "0.7.0"
-dotenv = "0.13.0"
 log = "0.4.3"
 env_logger = "0.5.10"

examples/hasura/examples/hasura.rs

@@ -16,7 +16,6 @@ struct UpsertIssue;
 
 fn main() -> Result<(), anyhow::Error> {
     use upsert_issue::{IssuesUpdateColumn::*, *};
-    dotenv::dotenv().ok();
     env_logger::init();
 
     let q = UpsertIssue::build_query(Variables {

graphql_client_cli/Cargo.toml

@@ -13,18 +13,15 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1.0"
-reqwest = { version = "^0.10", features = ["json", "blocking"] }
-graphql_client = { version = "0.9.0", path = "../graphql_client", features = [] }
+reqwest = { version = "^0.11", features = ["json", "blocking"] }
+graphql_client = { version = "0.9.0", path = "../graphql_client", default-features = false, features = ["graphql_query_derive"] }
 graphql_client_codegen = { path = "../graphql_client_codegen/", version = "0.9.0" }
 structopt = "0.3"
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
-syn = "^1.0"
 log = "^0.4"
 env_logger = "^0.6"
-
-rustfmt-nightly = { version = "1.4.5", optional = true }
+syn = "1.0"
 
 [features]
 default = []
-rustfmt = ["rustfmt-nightly"]

graphql_client_cli/README.md

@@ -40,7 +40,7 @@ USAGE:
 FLAGS:
     -h, --help             Prints help information
         --no-formatting    If you don't want to execute rustfmt to generated code, set this option. Default value is
-                           false. Formating feature is disabled as default installation.
+                           false.
     -V, --version          Prints version information
 
 OPTIONS:
@@ -66,5 +66,5 @@ ARGS:
 If you want to use formatting feature, you should install like this.
 
 ```bash
-cargo install graphql_client_cli --features rustfmt --force
+cargo install graphql_client_cli
 ```

graphql_client_cli/src/generate.rs

@@ -5,6 +5,7 @@ use graphql_client_codegen::{
 use std::fs::File;
 use std::io::Write as _;
 use std::path::PathBuf;
+use std::process::Stdio;
 use syn::Token;
 
 pub(crate) struct CliCodegenParams {
@@ -75,7 +76,7 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
     let gen = generate_module_token_stream(query_path.clone(), &schema_path, options).unwrap();
 
     let generated_code = gen.to_string();
-    let generated_code = if cfg!(feature = "rustfmt") && !no_formatting {
+    let generated_code = if !no_formatting {
         format(&generated_code)
     } else {
         generated_code
@@ -90,31 +91,33 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
         .map(|output_dir| output_dir.join(query_file_name).with_extension("rs"))
         .unwrap_or_else(move || query_path.with_extension("rs"));
 
+    log::info!("Writing generated query to {:?}", dest_file_path);
+
     let mut file = File::create(dest_file_path)?;
     write!(file, "{}", generated_code)?;
 
     Ok(())
 }
 
-#[allow(unused_variables)]
-fn format(codes: &str) -> String {
-    #[cfg(feature = "rustfmt")]
-    {
-        use rustfmt::{Config, Input, Session};
-
-        let mut config = Config::default();
+fn format(code: &str) -> String {
+    let binary = "rustfmt";
 
-        config.set().emit_mode(rustfmt_nightly::EmitMode::Stdout);
-        config.set().verbose(rustfmt_nightly::Verbosity::Quiet);
+    let mut child = std::process::Command::new(binary)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()
+        .unwrap();
+    let child_stdin = child.stdin.as_mut().unwrap();
+    write!(child_stdin, "{}", code).unwrap();
 
-        let mut out = Vec::with_capacity(codes.len() * 2);
+    let output = child.wait_with_output().unwrap();
 
-        Session::new(config, Some(&mut out))
-            .format(Input::Text(codes.to_string()))
-            .unwrap_or_else(|err| panic!("rustfmt error: {}", err));
-
-        return String::from_utf8(out).unwrap();
+    if !output.status.success() {
+        panic!(
+            "rustfmt error\n\n{}",
+            String::from_utf8_lossy(&output.stderr)
+        );
     }
-    #[cfg(not(feature = "rustfmt"))]
-    unreachable!("called format() without the rustfmt feature")
+
+    String::from_utf8(output.stdout).unwrap()
 }

graphql_client_cli/src/main.rs

@@ -1,9 +1,6 @@
 use env_logger::fmt::{Color, Style, StyledValue};
 use log::Level;
 
-#[cfg(feature = "rustfmt")]
-extern crate rustfmt_nightly as rustfmt;
-
 mod generate;
 mod introspect_schema;
 use std::path::PathBuf;
@@ -57,7 +54,6 @@ enum Cli {
         deprecation_strategy: Option<String>,
         /// If you don't want to execute rustfmt to generated code, set this option.
         /// Default value is false.
-        /// 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.

graphql_query_derive/src/attributes.rs

@@ -78,7 +78,7 @@ pub fn extract_attr_list(ast: &syn::DeriveInput, attr: &str) -> Result<Vec<Strin
 pub fn extract_deprecation_strategy(
     ast: &syn::DeriveInput,
 ) -> Result<DeprecationStrategy, syn::Error> {
-    extract_attr(&ast, "deprecated")?
+    extract_attr(ast, "deprecated")?
         .to_lowercase()
         .as_str()
         .parse()
@@ -87,7 +87,7 @@ pub fn extract_deprecation_strategy(
 
 /// Get the deprecation from a struct attribute in the derive case.
 pub fn extract_normalization(ast: &syn::DeriveInput) -> Result<Normalization, syn::Error> {
-    extract_attr(&ast, "normalization")?
+    extract_attr(ast, "normalization")?
         .to_lowercase()
         .as_str()
         .parse()

graphql_query_derive/src/lib.rs

@@ -28,16 +28,15 @@ fn graphql_query_derive_inner(
     let ast = syn::parse2(input)?;
     let (query_path, schema_path) = build_query_and_schema_path(&ast)?;
     let options = build_graphql_client_derive_options(&ast, query_path.clone())?;
-    Ok(
-        generate_module_token_stream(query_path, &schema_path, options)
-            .map(Into::into)
-            .map_err(|err| {
-                syn::Error::new_spanned(
-                    ast,
-                    format!("Failed to generate GraphQLQuery impl: {}", err),
-                )
-            }),
-    )
+
+    generate_module_token_stream(query_path, &schema_path, options)
+        .map(Into::into)
+        .map_err(|err| {
+            syn::Error::new_spanned(
+                ast,
+                format!("Failed to generate GraphQLQuery impl: {}", err),
+            )
+        })
 }
 
 fn build_query_and_schema_path(input: &syn::DeriveInput) -> Result<(PathBuf, PathBuf), syn::Error> {