Merge remote-tracking branch 'upstream/master' into 2018-edition

Author: h-michael

CHANGELOG.md

@@ -7,9 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
-## 0.8.0 - 2019-03-23
+## 0.8.0
+
 This release is only compatible with Rust 1.31.0 and later.
 
+## 0.7.1
+
+### Fixed
+
+- In the CLI, both --selected-operation and --output used the -o shorthand. --output now uses -out.
+>>>>>>> upstream/master
+
 ## 0.7.0 - 2019-03-21
 
 ### Changed

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>,
     },
 }