From fda51c8e8773cd7c2b0c1db77dd675e21c5301a7 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 7 Jul 2020 20:35:04 -0400 Subject: Refactor: line numbers --- src/features/line_numbers.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/features') 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, Option)>, + line_numbers_data: &'a LineNumbersData, + line_numbers: (Option, Option), config: &'a config::Config, ) -> Vec> { - 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) { -- cgit v1.2.3