From 08dfdc877b8539ae531e454571e211b75c9ab36e Mon Sep 17 00:00:00 2001 From: Kevin K Date: Mon, 12 Feb 2018 14:52:29 -0500 Subject: [PATCH] style: changes values->possible values in help messages as well as errors --- src/app/help.rs | 4 ++-- tests/help.rs | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/help.rs b/src/app/help.rs index df1d034c..4ec25197 100644 --- a/src/app/help.rs +++ b/src/app/help.rs @@ -540,14 +540,14 @@ impl<'w> Help<'w> { debugln!("Help::spec_vals: Found possible vals...{:?}", pv); spec_vals.push(if self.color { format!( - " [values: {}]", + " [possible values: {}]", pv.iter() .map(|v| format!("{}", self.cizer.good(v))) .collect::>() .join(", ") ) } else { - format!(" [values: {}]", pv.join(", ")) + format!(" [possible values: {}]", pv.join(", ")) }); } } diff --git a/tests/help.rs b/tests/help.rs index 10db0a65..af58bb35 100644 --- a/tests/help.rs +++ b/tests/help.rs @@ -34,7 +34,7 @@ FLAGS: -V, --version Prints version information OPTIONS: - -O, --Option specific vals [values: fast, slow] + -O, --Option specific vals [possible values: fast, slow] --long-option-2 tests long options with exclusions --maxvals3 ... Tests 3 max vals --minvals2 ... Tests 2 min vals @@ -45,7 +45,7 @@ OPTIONS: ARGS: tests positionals tests positionals with exclusions - ... tests specific values [values: vi, emacs] + ... tests specific values [possible values: vi, emacs] SUBCOMMANDS: help Prints this message or the help of the given subcommand(s) @@ -244,7 +244,7 @@ FLAGS: OPTIONS: -c, --cafe A coffeehouse, coffee shop, or café. - -p, --pos Some vals [values: fast, slow]"; + -p, --pos Some vals [possible values: fast, slow]"; static FINAL_WORD_WRAPPING: &'static str = "ctest 0.1 @@ -299,8 +299,8 @@ FLAGS: OPTIONS: --filter Sets the filter, or sampling method, to use for interpolation when resizing the particle - images. The default is Linear (Bilinear). [values: Nearest, Linear, Cubic, Gaussian, - Lanczos3]"; + images. The default is Linear (Bilinear). [possible values: Nearest, Linear, Cubic, + Gaussian, Lanczos3]"; static ISSUE_702: &'static str = "myapp 1.0 foo @@ -501,7 +501,7 @@ FLAGS: OPTIONS: -c, --cafe A coffeehouse, coffee shop, or café. [env: ENVVAR] - -p, --pos Some vals [values: fast, slow]"; + -p, --pos Some vals [possible values: fast, slow]"; static SHOW_ENV_VALS: &'static str = "ctest 0.1 @@ -514,7 +514,7 @@ FLAGS: OPTIONS: -c, --cafe A coffeehouse, coffee shop, or café. [env: ENVVAR=MYVAL] - -p, --pos Some vals [values: fast, slow]"; + -p, --pos Some vals [possible values: fast, slow]"; fn setup() -> App<'static, 'static> { App::new("test") @@ -877,7 +877,7 @@ fn issue_688_hidden_pos_vals() { .setting(AppSettings::HidePossibleValuesInHelp) .arg(Arg::with_name("filter") .help("Sets the filter, or sampling method, to use for interpolation when resizing the particle \ - images. The default is Linear (Bilinear). [values: Nearest, Linear, Cubic, Gaussian, Lanczos3]") + images. The default is Linear (Bilinear). [possible values: Nearest, Linear, Cubic, Gaussian, Lanczos3]") .long("filter") .possible_values(&filter_values) .takes_value(true)); @@ -899,7 +899,7 @@ fn issue_688_hidden_pos_vals() { .set_term_width(120) .arg(Arg::with_name("filter") .help("Sets the filter, or sampling method, to use for interpolation when resizing the particle \ - images. The default is Linear (Bilinear). [values: Nearest, Linear, Cubic, Gaussian, Lanczos3]") + images. The default is Linear (Bilinear). [possible values: Nearest, Linear, Cubic, Gaussian, Lanczos3]") .long("filter") .takes_value(true)); assert!(test::compare_output(app3, "ctest --help", ISSUE_688, false));