diff options
author | Dan Davison <dandavison7@gmail.com> | 2021-11-14 14:30:22 -0500 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2021-11-14 14:30:22 -0500 |
commit | 88677dc92938fbbfe92ec676891f28b51de15485 (patch) | |
tree | 19e0ff8ef08b8bb9fdbe302cec3d953ab03584bd | |
parent | 93d37649ae63312548bb319e5d6d7305834e502f (diff) |
Sort config struct entries
-rw-r--r-- | src/config.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/config.rs b/src/config.rs index 56e9eec6..770a9eb6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -57,9 +57,9 @@ fn adapt_wrap_max_lines_argument(arg: String) -> usize { pub struct Config { pub available_terminal_width: usize, pub background_color_extends_to_terminal_width: bool, - pub commit_style: Style, pub color_only: bool, pub commit_regex: Regex, + pub commit_style: Style, pub cwd_relative_to_repo_root: Option<String>, pub decorations_width: cli::Width, pub default_language: Option<String>, @@ -70,38 +70,40 @@ pub struct Config { pub file_modified_label: String, pub file_removed_label: String, pub file_renamed_label: String, - pub hunk_label: String, pub file_style: Style, - pub git_config: Option<GitConfig>, pub git_config_entries: HashMap<String, GitConfigEntry>, + pub git_config: Option<GitConfig>, + pub git_minus_style: Style, + pub git_plus_style: Style, pub hunk_header_file_style: Style, pub hunk_header_line_number_style: Style, - pub hunk_header_style: Style, pub hunk_header_style_include_file_path: bool, pub hunk_header_style_include_line_number: bool, - pub hyperlinks: bool, + pub hunk_header_style: Style, + pub hunk_label: String, pub hyperlinks_commit_link_format: Option<String>, pub hyperlinks_file_link_format: String, + pub hyperlinks: bool, pub inline_hint_style: Style, pub inspect_raw_lines: cli::InspectRawLines, pub keep_plus_minus_markers: bool, + pub line_buffer_size: usize, pub line_fill_method: BgFillMethod, - pub line_numbers: bool, pub line_numbers_format: LeftRight<String>, pub line_numbers_style_leftright: LeftRight<Style>, pub line_numbers_style_minusplus: MinusPlus<Style>, pub line_numbers_zero_style: Style, - pub line_buffer_size: usize, - pub max_line_distance: f64, + pub line_numbers: bool, pub max_line_distance_for_naively_paired_lines: f64, + pub max_line_distance: f64, pub max_line_length: usize, pub minus_emph_style: Style, pub minus_empty_line_marker_style: Style, pub minus_file: Option<PathBuf>, pub minus_non_emph_style: Style, pub minus_style: Style, - pub navigate: bool, pub navigate_regexp: Option<String>, + pub navigate: bool, pub null_style: Style, pub null_syntect_style: SyntectStyle, pub pager: Option<String>, @@ -111,12 +113,10 @@ pub struct Config { pub plus_file: Option<PathBuf>, pub plus_non_emph_style: Style, pub plus_style: Style, - pub git_minus_style: Style, - pub git_plus_style: Style, pub relative_paths: bool, pub show_themes: bool, - pub side_by_side: bool, pub side_by_side_data: side_by_side::SideBySideData, + pub side_by_side: bool, pub syntax_dummy_theme: SyntaxTheme, pub syntax_set: SyntaxSet, pub syntax_theme: Option<SyntaxTheme>, |