diff options
author | Dan Davison <dandavison7@gmail.com> | 2020-07-07 20:35:04 -0400 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2020-07-07 20:35:04 -0400 |
commit | fda51c8e8773cd7c2b0c1db77dd675e21c5301a7 (patch) | |
tree | bf904acf848c4e4c55905e6170bf0bd9428a2ed1 /src/features | |
parent | b88ab3de01d6dfeb76967a9abcda1b79d10aa1b1 (diff) |
Refactor: line numbers
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/line_numbers.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/features/line_numbers.rs b/src/features/line_numbers.rs index caa9944c..e8a10ff4 100644 --- a/src/features/line_numbers.rs +++ b/src/features/line_numbers.rs @@ -60,12 +60,11 @@ pub fn make_feature() -> Vec<(String, OptionValueFunction)> { /// Return a vec of `ansi_term::ANSIGenericString`s representing the left and right fields of the /// two-column line number display. pub fn format_and_paint_line_numbers<'a>( - line_numbers_data: Option<&'a LineNumbersData>, - line_numbers: &'a Option<(Option<usize>, Option<usize>)>, + line_numbers_data: &'a LineNumbersData, + line_numbers: (Option<usize>, Option<usize>), config: &'a config::Config, ) -> Vec<ansi_term::ANSIGenericString<'a, str>> { - let line_numbers_data = line_numbers_data.unwrap(); - let (minus_number, plus_number) = line_numbers.unwrap(); + let (minus_number, plus_number) = line_numbers; // If both minus and plus numbers are present then the line is a zero line. let (minus_number_style, plus_number_style) = match (minus_number, plus_number) { |