Fix last compiler errors

Author: tomhoule

examples/github/examples/github.rs

@@ -1,3 +1,4 @@
+use ::reqwest::blocking::Client;
 use anyhow::*;
 use graphql_client::*;
 use log::*;
@@ -51,9 +52,7 @@ fn main() -> Result<(), anyhow::Error> {
         name: name.to_string(),
     });
 
-    let client = reqwest::blocking::Client::builder()
-        .user_agent("graphql-rust/0.9.0")
-        .build()?;
+    let client = Client::builder().user_agent("graphql-rust/0.9.0").build()?;
 
     let res = client
         .post("https://api.github.com/graphql")

examples/hasura/examples/hasura.rs

@@ -1,3 +1,4 @@
+use ::reqwest::blocking::Client;
 use graphql_client::*;
 use log::*;
 use prettytable::*;
@@ -28,7 +29,7 @@ fn main() -> Result<(), anyhow::Error> {
         update_columns: vec![Name, Status, SalesforceUpdatedAt],
     });
 
-    let client = reqwest::blocking::Client::new();
+    let client = Client::new();
 
     let res = client
         .post("https://localhost:8080/v1/graphql")

examples/web/Cargo.toml

@@ -28,4 +28,5 @@ features = [
     "HtmlBodyElement",
     "HtmlDocument",
     "HtmlElement",
+    "Window",
 ]

graphql_client_cli/Cargo.toml

@@ -12,7 +12,6 @@ name = "graphql-client"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = "1.0"
 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" }

graphql_client_cli/src/generate.rs

@@ -1,4 +1,3 @@
-use anyhow::*;
 use graphql_client_codegen::{
     generate_module_token_stream, CodegenMode, GraphQLClientCodegenOptions,
 };
@@ -21,7 +20,7 @@ pub(crate) struct CliCodegenParams {
     pub custom_scalars_module: Option<String>,
 }
 
-pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
+pub(crate) fn generate_code(params: CliCodegenParams) {
     let CliCodegenParams {
         variables_derives,
         response_derives,
@@ -63,12 +62,8 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
     }
 
     if let Some(custom_scalars_module) = custom_scalars_module {
-        let custom_scalars_module = syn::parse_str(&custom_scalars_module).with_context(|| {
-            format!(
-                "Invalid custom scalars module path: {}",
-                custom_scalars_module
-            )
-        })?;
+        let custom_scalars_module =
+            syn::parse_str(&custom_scalars_module).expect("Invalid custom scalar module path");
 
         options.set_custom_scalars_module(custom_scalars_module);
     }
@@ -85,18 +80,17 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
     let query_file_name: ::std::ffi::OsString = query_path
         .file_name()
         .map(ToOwned::to_owned)
-        .ok_or_else(|| format_err!("Failed to find a file name in the provided query path."))?;
+        .ok_or_else(|| "Failed to find a file name in the provided query path.".to_owned())
+        .unwrap();
 
     let dest_file_path: PathBuf = output_directory
         .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(())
+    let mut file = File::create(dest_file_path).unwrap();
+    write!(file, "{}", generated_code).unwrap();
 }
 
 fn format(code: &str) -> String {

graphql_client_cli/src/introspect_schema.rs

@@ -1,4 +1,3 @@
-use anyhow::*;
 use graphql_client::GraphQLQuery;
 use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE};
 use std::path::PathBuf;
@@ -20,11 +19,11 @@ pub fn introspect_schema(
     authorization: Option<String>,
     headers: Vec<Header>,
     no_ssl: bool,
-) -> anyhow::Result<()> {
+) {
     use std::io::Write;
 
     let out: Box<dyn Write> = match output {
-        Some(path) => Box::new(::std::fs::File::create(path)?),
+        Some(path) => Box::new(::std::fs::File::create(path).unwrap()),
         None => Box::new(std::io::stdout()),
     };
 
@@ -36,7 +35,8 @@ pub fn introspect_schema(
 
     let client = reqwest::blocking::Client::builder()
         .danger_accept_invalid_certs(no_ssl)
-        .build()?;
+        .build()
+        .unwrap();
 
     let mut req_builder = client.post(location).headers(construct_headers());
 
@@ -48,7 +48,7 @@ pub fn introspect_schema(
         req_builder = req_builder.bearer_auth(token.as_str());
     };
 
-    let res = req_builder.json(&request_body).send()?;
+    let res = req_builder.json(&request_body).send().unwrap();
 
     if res.status().is_success() {
         // do nothing
@@ -58,9 +58,8 @@ pub fn introspect_schema(
         println!("Something else happened. Status: {:?}", res.status());
     }
 
-    let json: serde_json::Value = res.json()?;
-    serde_json::to_writer_pretty(out, &json)?;
-    Ok(())
+    let json: serde_json::Value = res.json().unwrap();
+    serde_json::to_writer_pretty(out, &json).unwrap();
 }
 
 fn construct_headers() -> HeaderMap {
@@ -77,12 +76,12 @@ pub struct Header {
 }
 
 impl FromStr for Header {
-    type Err = anyhow::Error;
+    type Err = String;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
         // error: colon required for name/value pair
         if !input.contains(':') {
-            return Err(format_err!(
+            return Err(format!(
                 "Invalid header input. A colon is required to separate the name and value. [{}]",
                 input
             ));
@@ -95,15 +94,15 @@ impl FromStr for Header {
 
         // error: field name must be
         if name.is_empty() {
-            return Err(format_err!(
+            return Err(format!(
                 "Invalid header input. Field name is required before colon. [{}]",
                 input
             ));
         }
 
         // error: no whitespace in field name
         if name.split_whitespace().count() > 1 {
-            return Err(format_err!(
+            return Err(format!(
                 "Invalid header input. Whitespace not allowed in field name. [{}]",
                 input
             ));

graphql_client_cli/src/main.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::redundant_clone)] // in structopt generated code
+
 use env_logger::fmt::{Color, Style, StyledValue};
 use log::Level;
 
@@ -73,7 +75,7 @@ enum Cli {
     },
 }
 
-fn main() -> anyhow::Result<()> {
+fn main() {
     set_env_logger();
 
     let cli = Cli::from_args();