diff options
author | Dan Davison <dandavison7@gmail.com> | 2020-06-25 11:02:03 -0400 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2020-06-25 15:18:19 -0400 |
commit | 1d19643af2d5efa0b5c5c5735233083e7e6bd6ca (patch) | |
tree | 8da994ef95b3afa4e5a12128e49a03b8dd3b95f8 /src/features | |
parent | 1478ce4d160711d416ddcd0cbb5b5de43e5254a2 (diff) |
Make number-zero-style non-Option
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/numbers.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/features/numbers.rs b/src/features/numbers.rs index 92b6b7f6..d304a04b 100644 --- a/src/features/numbers.rs +++ b/src/features/numbers.rs @@ -22,9 +22,9 @@ pub fn make_feature() -> Vec<(String, OptionValueFunction)> { ), ( "number-zero-style", - Option<String>, + String, None, - _opt => Some("#dddddd".to_string()) + _opt => "#dddddd" ), ( "number-plus-style", @@ -44,11 +44,10 @@ pub fn format_and_paint_line_numbers<'a>( let (minus_number, plus_number) = line_numbers.unwrap(); // If both minus and plus numbers are present then the line is a zero line. - let (number_minus_style, number_plus_style) = - match (minus_number, plus_number, config.number_zero_style) { - (Some(_), Some(_), Some(zero_style)) => (zero_style, zero_style), - _ => (config.number_minus_style, config.number_plus_style), - }; + let (number_minus_style, number_plus_style) = match (minus_number, plus_number) { + (Some(_), Some(_)) => (config.number_zero_style, config.number_zero_style), + _ => (config.number_minus_style, config.number_plus_style), + }; let mut formatted_numbers = Vec::new(); |