Rebase conflicts

tomhoule · tomhoule · commit ca2ad8ad23ba · 2020-05-13T21:39:51.000+02:00
diff --git a/graphql_client/Cargo.toml b/graphql_client/Cargo.toml
@@ -16,7 +16,6 @@ thiserror = { version = "1.0", optional = true }
 graphql_query_derive = { path = "../graphql_query_derive", version = "0.9.0" }
 serde_json = "1.0"
 serde = { version = "^1.0.78", features = ["derive"] }
-thiserror = "1.0.10"
 
 [dependencies.futures]
 version = "^0.1"
diff --git a/graphql_client_cli/src/generate.rs b/graphql_client_cli/src/generate.rs
@@ -59,7 +59,7 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {
         options.set_deprecation_strategy(deprecation_strategy);
     }
 
-    let gen = generate_module_token_stream(query_path.clone(), &schema_path, options).map_err(|fail| fail.compat())?;
+    let gen = generate_module_token_stream(query_path.clone(), &schema_path, options)?;
 
     let generated_code = gen.to_string();
     let generated_code = if cfg!(feature = "rustfmt") && !no_formatting {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<()> {`
`59`	`59`	`options.set_deprecation_strategy(deprecation_strategy);`
`60`	`60`	`}`
`61`	`61`
`62`		`- let gen = generate_module_token_stream(query_path.clone(), &schema_path, options).map_err(\|fail\| fail.compat())?;`
	`62`	`+ let gen = generate_module_token_stream(query_path.clone(), &schema_path, options)?;`
`63`	`63`
`64`	`64`	`let generated_code = gen.to_string();`
`65`	`65`	`let generated_code = if cfg!(feature = "rustfmt") && !no_formatting {`