summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/config.rs b/src/config.rs
index ce3e9c91..97b03645 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -49,11 +49,11 @@ pub struct Config {
pub null_style: Style,
pub null_syntect_style: SyntectStyle,
pub line_numbers_left_format: String,
- pub line_numbers_left_format_style: Style,
+ pub line_numbers_left_style: Style,
pub line_numbers_minus_style: Style,
pub line_numbers_plus_style: Style,
pub line_numbers_right_format: String,
- pub line_numbers_right_format_style: Style,
+ pub line_numbers_right_style: Style,
pub line_numbers_zero_style: Style,
pub paging_mode: PagingMode,
pub plus_emph_style: Style,
@@ -160,8 +160,8 @@ impl From<cli::Opt> for Config {
line_numbers_minus_style,
line_numbers_zero_style,
line_numbers_plus_style,
- line_numbers_left_format_style,
- line_numbers_right_format_style,
+ line_numbers_left_style,
+ line_numbers_right_style,
) = make_line_number_styles(&opt, true_color);
let syntax_theme = if syntax_theme::is_no_syntax_highlighting_theme_name(&syntax_theme_name)
@@ -213,11 +213,11 @@ impl From<cli::Opt> for Config {
null_style: Style::new(),
null_syntect_style: SyntectStyle::default(),
line_numbers_left_format: opt.line_numbers_left_format,
- line_numbers_left_format_style,
+ line_numbers_left_style,
line_numbers_minus_style,
line_numbers_plus_style,
line_numbers_right_format: opt.line_numbers_right_format,
- line_numbers_right_format_style,
+ line_numbers_right_style,
line_numbers_zero_style,
paging_mode,
plus_emph_style,
@@ -379,8 +379,8 @@ fn make_line_number_styles<'a>(
opt: &'a cli::Opt,
true_color: bool,
) -> (Style, Style, Style, Style, Style) {
- let line_numbers_left_format_style = Style::from_str(
- &opt.line_numbers_left_format_style,
+ let line_numbers_left_style = Style::from_str(
+ &opt.line_numbers_left_style,
None,
None,
None,
@@ -415,8 +415,8 @@ fn make_line_number_styles<'a>(
false,
);
- let line_numbers_right_format_style = Style::from_str(
- &opt.line_numbers_right_format_style,
+ let line_numbers_right_style = Style::from_str(
+ &opt.line_numbers_right_style,
None,
None,
None,
@@ -428,8 +428,8 @@ fn make_line_number_styles<'a>(
line_numbers_minus_style,
line_numbers_zero_style,
line_numbers_plus_style,
- line_numbers_left_format_style,
- line_numbers_right_format_style,
+ line_numbers_left_style,
+ line_numbers_right_style,
)
}