From 5ef1c6cce2bbe2065367b239c2db0547340ddea7 Mon Sep 17 00:00:00 2001 From: Liam Kalir Date: Sun, 26 Jan 2020 19:19:54 -0500 Subject: [PATCH] Grammar touch-ups, more descriptive error message for invalid line ranges --- src/bin/bat/clap_app.rs | 6 +++--- src/line_range.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs index 0e46c885..f234085a 100644 --- a/src/bin/bat/clap_app.rs +++ b/src/bin/bat/clap_app.rs @@ -87,10 +87,10 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> { .long_help( "Highlight the specified line ranges with a different background color \ For example:\n \ + '--highlight-line 40' highlights line 40\n \ '--highlight-line 30:40' highlights lines 30 to 40\n \ '--highlight-line :40' highlights lines 1 to 40\n \ - '--highlight-line 40:' highlights lines 40 to the end of the file\n \ - '--highlight-line 40' highlights only line 40", + '--highlight-line 40:' highlights lines 40 to the end of the file" ), ) .arg( @@ -334,7 +334,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> { '--line-range 30:40' prints lines 30 to 40\n \ '--line-range :40' prints lines 1 to 40\n \ '--line-range 40:' prints lines 40 to the end of the file\n \ - '--line-range 40' prints only line 40", + '--line-range 40' only prints line 40", ), ) .arg( diff --git a/src/line_range.rs b/src/line_range.rs index ac3ec981..9e656cb2 100644 --- a/src/line_range.rs +++ b/src/line_range.rs @@ -41,7 +41,7 @@ impl LineRange { new_range.upper = line_numbers[1].parse()?; Ok(new_range) }, - _ => Err("expected at most single ':' character".into()), + _ => Err("Line range contained more than one ':' character. Expected format: 'N' or 'N:M'".into()), } }