Merge pull request #231 from graphql-rust/cli-options-clash

Fix naming clash in the CLI flags (fixes #230)

Author: tomhoule

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+### Fixed
+
+- In the CLI, both --selected-operation and --output used the -o shorthand. --output now uses -out.
+
 ## 0.7.0 - 2019-03-21
 
 ### Changed

graphql_client_cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "graphql_client_cli"
 description = "The CLI for graphql-client"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Tom Houlé <[email protected]>"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/graphql-rust/graphql-client"

graphql_client_cli/src/main.rs

@@ -71,7 +71,7 @@ enum Cli {
         ///
         /// If this option is omitted, the code will be generated next to the .graphql
         /// file, with the same name and the .rs extension.
-        #[structopt(short = "o", long = "output-directory")]
+        #[structopt(short = "out", long = "output-directory")]
         output_directory: Option<PathBuf>,
     },
 }