diff options
Diffstat (limited to 'src/options/set.rs')
| -rw-r--r-- | src/options/set.rs | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/options/set.rs b/src/options/set.rs index 5b68ffec..cebdd2f7 100644 --- a/src/options/set.rs +++ b/src/options/set.rs @@ -16,7 +16,7 @@ use crate::features; use crate::git_config; use crate::git_config_entry::{self, GitConfigEntry}; use crate::options::option_value::{OptionValue, ProvenancedOptionValue}; -use crate::options::{self, theme}; +use crate::options::theme; macro_rules! set_options { ([$( $field_ident:ident ),* ], @@ -186,8 +186,6 @@ pub fn set_options( opt.computed.inspect_raw_lines = cli::InspectRawLines::from_str(&opt.inspect_raw_lines).unwrap(); - opt.computed.line_numbers_mode = - compute_line_numbers_mode(opt, &builtin_features, git_config, &option_names); opt.computed.paging_mode = parse_paging_mode(&opt.paging_mode); // --color-only is used for interactive.diffFilter (git add -p). side-by-side, and @@ -201,31 +199,6 @@ pub fn set_options( } } -fn compute_line_numbers_mode( - opt: &cli::Opt, - builtin_features: &HashMap<String, features::BuiltinFeature>, - git_config: &mut Option<git_config::GitConfig>, - option_names: &HashMap<&str, &str>, -) -> cli::LineNumbersMode { - // line-numbers is in general treated as a boolean value. We read it as a string here in order - // to interpret an explicit "false" (as opposed to merely absence) as meaning "Do not show any - // line numbers; not even the first line number of the hunk". - let line_numbers_string_value: Option<Option<String>> = options::get::get_option_value( - option_names["line-numbers"], - builtin_features, - opt, - git_config, - ); - match ( - line_numbers_string_value.as_ref().map(|val| val.as_deref()), - opt.line_numbers, - ) { - (Some(Some("false")), _) => cli::LineNumbersMode::None, - (_, true) => cli::LineNumbersMode::Full, - (_, false) => cli::LineNumbersMode::First, - } -} - #[allow(non_snake_case)] fn set__light__dark__syntax_theme__options( opt: &mut cli::Opt, |