Refactor: rename: LineSegments -> LineSections

3 files changed, 45 insertions, 45 deletions

diff --git a/src/features/side_by_side.rs b/src/features/side_by_side.rs
index 7f944772..f335632c 100644
--- a/src/features/side_by_side.rs
+++ b/src/features/side_by_side.rs
@@ -14,7 +14,7 @@ use crate::paint::{BgFillMethod, BgShouldFill};
 use crate::style::Style;
 use crate::wrapping::wrap_zero_block;
 
-pub type LineSegments<'a, S> = Vec<(S, &'a str)>;
+pub type LineSections<'a, S> = Vec<(S, &'a str)>;
 
 pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
     builtin_feature!([
@@ -111,8 +111,8 @@ pub fn has_long_lines(
 /// Emit a sequence of minus and plus lines in side-by-side mode.
 #[allow(clippy::too_many_arguments)]
 pub fn paint_minus_and_plus_lines_side_by_side<'a>(
-    syntax_left_right: LeftRight<Vec<LineSegments<'a, SyntectStyle>>>,
-    diff_left_right: LeftRight<Vec<LineSegments<'a, Style>>>,
+    syntax_left_right: LeftRight<Vec<LineSections<'a, SyntectStyle>>>,
+    diff_left_right: LeftRight<Vec<LineSections<'a, Style>>>,
     states_left_right: LeftRight<Vec<State>>,
     line_alignment: Vec<(Option<usize>, Option<usize>)>,
     output_buffer: &mut String,
@@ -152,8 +152,8 @@ pub fn paint_minus_and_plus_lines_side_by_side<'a>(
 #[allow(clippy::too_many_arguments)]
 pub fn paint_zero_lines_side_by_side<'a>(
     raw_line: &str,
-    syntax_style_sections: Vec<LineSegments<'a, SyntectStyle>>,
-    diff_style_sections: Vec<LineSegments<'a, Style>>,
+    syntax_style_sections: Vec<LineSections<'a, SyntectStyle>>,
+    diff_style_sections: Vec<LineSections<'a, Style>>,
     output_buffer: &mut String,
     config: &Config,
     line_numbers_data: &mut Option<&mut line_numbers::LineNumbersData>,
@@ -206,8 +206,8 @@ pub fn paint_zero_lines_side_by_side<'a>(
 #[allow(clippy::too_many_arguments)]
 fn paint_left_panel_minus_line<'a>(
     line_index: Option<usize>,
-    syntax_style_sections: &[LineSegments<'a, SyntectStyle>],
-    diff_style_sections: &[LineSegments<'a, Style>],
+    syntax_style_sections: &[LineSections<'a, SyntectStyle>],
+    diff_style_sections: &[LineSections<'a, Style>],
     state: &'a State,
     line_numbers_data: &mut Option<&mut line_numbers::LineNumbersData>,
     background_color_extends_to_terminal_width: BgShouldFill,
@@ -239,8 +239,8 @@ fn paint_left_panel_minus_line<'a>(
 #[allow(clippy::too_many_arguments)]
 fn paint_right_panel_plus_line<'a>(
     line_index: Option<usize>,
-    syntax_style_sections: &[LineSegments<'a, SyntectStyle>],
-    diff_style_sections: &[LineSegments<'a, Style>],
+    syntax_style_sections: &[LineSections<'a, SyntectStyle>],
+    diff_style_sections: &[LineSections<'a, Style>],
     state: &'a State,
     line_numbers_data: &mut Option<&mut line_numbers::LineNumbersData>,
     background_color_extends_to_terminal_width: BgShouldFill,
@@ -273,7 +273,7 @@ fn paint_right_panel_plus_line<'a>(
 fn get_right_fill_style_for_panel<'a>(
     line_is_empty: bool,
     line_index: Option<usize>,
-    diff_style_sections: &[LineSegments<'a, Style>],
+    diff_style_sections: &[LineSections<'a, Style>],
     state: &State,
     panel_side: PanelSide,
     background_color_extends_to_terminal_width: BgShouldFill,
@@ -330,8 +330,8 @@ fn get_right_fill_style_for_panel<'a>(
 #[allow(clippy::too_many_arguments)]
 fn paint_minus_or_plus_panel_line<'a>(
     line_index: Option<usize>,
-    syntax_style_sections: &[LineSegments<'a, SyntectStyle>],
-    diff_style_sections: &[LineSegments<'a, Style>],
+    syntax_style_sections: &[LineSections<'a, SyntectStyle>],
+    diff_style_sections: &[LineSections<'a, Style>],
     state: &State,
     line_numbers_data: &mut Option<&mut line_numbers::LineNumbersData>,
     panel_side: PanelSide,
@@ -388,7 +388,7 @@ fn pad_panel_line_to_width<'a>(
     panel_line: &mut String,
     panel_line_is_empty: bool,
     line_index: Option<usize>,
-    diff_style_sections: &[LineSegments<'a, Style>],
+    diff_style_sections: &[LineSections<'a, Style>],
     state: &State,
     panel_side: PanelSide,
     background_color_extends_to_terminal_width: BgShouldFill,
diff --git a/src/paint.rs b/src/paint.rs
index fbd0ee15..f188306d 100644
--- a/src/paint.rs
+++ b/src/paint.rs
@@ -13,7 +13,7 @@ use crate::edits;
 use crate::features::hyperlinks;
 use crate::features::line_numbers;
 use crate::features::side_by_side::ansifill;
-use crate::features::side_by_side::{self, available_line_width, LineSegments, PanelSide};
+use crate::features::side_by_side::{self, available_line_width, LineSections, PanelSide};
 use crate::minusplus::*;
 use crate::paint::superimpose_style_sections::superimpose_style_sections;
 use crate::style::Style;
@@ -60,7 +60,7 @@ impl Default for BgShouldFill {
 #[derive(PartialEq, Debug)]
 pub enum StyleSectionSpecifier<'l> {
     Style(Style),
-    StyleSections(LineSegments<'l, Style>),
+    StyleSections(LineSections<'l, Style>),
 }
 
 impl<'p> Painter<'p> {
@@ -339,8 +339,8 @@ impl<'p> Painter<'p> {
     /// highlighting styles, and write colored lines to output buffer.
     #[allow(clippy::too_many_arguments)]
     pub fn paint_lines<'a>(
-        syntax_style_sections: Vec<LineSegments<'a, SyntectStyle>>,
-        diff_style_sections: Vec<LineSegments<'a, Style>>,
+        syntax_style_sections: Vec<LineSections<'a, SyntectStyle>>,
+        diff_style_sections: Vec<LineSections<'a, Style>>,
         states: impl Iterator<Item = &'a State>,
         output_buffer: &mut String,
         config: &config::Config,
@@ -626,7 +626,7 @@ impl<'p> Painter<'p> {
         lines: &'a [(String, State)],
         highlighter: Option<&mut HighlightLines>,
         config: &config::Config,
-    ) -> Vec<LineSegments<'a, SyntectStyle>> {
+    ) -> Vec<LineSections<'a, SyntectStyle>> {
         let mut line_sections = Vec::new();
         match (
             highlighter,
@@ -655,8 +655,8 @@ impl<'p> Painter<'p> {
         plus_lines_and_states: &'a [(String, State)],
         config: &config::Config,
     ) -> (
-        Vec<LineSegments<'a, Style>>,
-        Vec<LineSegments<'a, Style>>,
+        Vec<LineSections<'a, Style>>,
+        Vec<LineSections<'a, Style>>,
         Vec<(Option<usize>, Option<usize>)>,
     ) {
         let (minus_lines, minus_styles): (Vec<&str>, Vec<Style>) = minus_lines_and_states
@@ -720,7 +720,7 @@ impl<'p> Painter<'p> {
     ///    how support for git's --color-moved is implemented.)
     fn update_styles<'a>(
         lines_and_states: &'a [(String, State)],
-        lines_style_sections: &mut Vec<LineSegments<'a, Style>>,
+        lines_style_sections: &mut Vec<LineSections<'a, Style>>,
         whitespace_error_style: Option<Style>,
         non_emph_style: Option<Style>,
         config: &config::Config,
@@ -759,7 +759,7 @@ impl<'p> Painter<'p> {
 pub fn parse_style_sections<'a>(
     raw_line: &'a str,
     config: &config::Config,
-) -> LineSegments<'a, Style> {
+) -> LineSections<'a, Style> {
     let empty_map = HashMap::new();
     let styles_map = config.styles_map.as_ref().unwrap_or(&empty_map);
     ansi::parse_style_sections(raw_line)
diff --git a/src/wrapping.rs b/src/wrapping.rs
index 5dc44701..bf1711ee 100644
--- a/src/wrapping.rs
+++ b/src/wrapping.rs
@@ -9,7 +9,7 @@ use crate::features::line_numbers;
 use crate::features::line_numbers::SideBySideLineWidth;
 use crate::features::side_by_side::available_line_width;
 use crate::features::side_by_side::line_is_too_long;
-use crate::features::side_by_side::LineSegments;
+use crate::features::side_by_side::LineSections;
 use crate::features::side_by_side::{Left, Right};
 use crate::minusplus::*;
 use crate::style::Style;
@@ -52,7 +52,7 @@ pub fn wrap_line<'a, I, S>(
     line_width: usize,
     fill_style: &S,
     inline_hint_style: &Option<S>,
-) -> Vec<LineSegments<'a, S>>
+) -> Vec<LineSections<'a, S>>
 where
     I: IntoIterator<Item = (S, &'a str)> + std::fmt::Debug,
     <I as IntoIterator>::IntoIter: DoubleEndedIterator,
@@ -65,7 +65,7 @@ where
     // The current line being assembled from the input to fit exactly into the given width.
     // A somewhat leaky abstraction as the fields are also accessed directly.
     struct CurrLine<'a, S: Default> {
-        line_segments: LineSegments<'a, S>,
+        line_segments: LineSections<'a, S>,
         len: usize,
     }
     impl<'a, S: Default> CurrLine<'a, S> {
@@ -244,8 +244,8 @@ where
 
 fn wrap_if_too_long<'a, S>(
     config: &'a Config,
-    wrapped: &mut Vec<LineSegments<'a, S>>,
-    input_vec: LineSegments<'a, S>,
+    wrapped: &mut Vec<LineSections<'a, S>>,
+    input_vec: LineSections<'a, S>,
     must_wrap: bool,
     line_width: usize,
     fill_style: &S,
@@ -277,16 +277,16 @@ where
 #[allow(clippy::comparison_chain, clippy::type_complexity)]
 pub fn wrap_minusplus_block<'c: 'a, 'a>(
     config: &'c Config,
-    syntax: MinusPlus<Vec<LineSegments<'a, SyntectStyle>>>,
-    diff: MinusPlus<Vec<LineSegments<'a, Style>>>,
+    syntax: MinusPlus<Vec<LineSections<'a, SyntectStyle>>>,
+    diff: MinusPlus<Vec<LineSections<'a, Style>>>,
     alignment: &[(Option<usize>, Option<usize>)],
     line_width: &SideBySideLineWidth,
     wrapinfo: &'a MinusPlus<Vec<bool>>,
 ) -> (
     Vec<(Option<usize>, Option<usize>)>,
     MinusPlus<Vec<State>>,
-    MinusPlus<Vec<LineSegments<'a, SyntectStyle>>>,
-    MinusPlus<Vec<LineSegments<'a, Style>>>,
+    MinusPlus<Vec<LineSections<'a, SyntectStyle>>>,
+    MinusPlus<Vec<LineSections<'a, Style>>>,
 ) {
     let mut new_alignment = Vec::new();
     let mut new_states = MinusPlus::<Vec<State>>::default();
@@ -306,8 +306,8 @@ pub fn wrap_minusplus_block<'c: 'a, 'a>(
     #[allow(clippy::too_many_arguments)]
     pub fn wrap_syntax_and_diff<'a, ItSyn, ItDiff, ItWrap>(
         config: &'a Config,
-        wrapped_syntax: &mut Vec<LineSegments<'a, SyntectStyle>>,
-        wrapped_diff: &mut Vec<LineSegments<'a, Style>>,
+        wrapped_syntax: &mut Vec<LineSections<'a, SyntectStyle>>,
+        wrapped_diff: &mut Vec<LineSections<'a, Style>>,
         syntax_iter: &mut ItSyn,
         diff_iter: &mut ItDiff,
         wrapinfo_iter: &mut ItWrap,
@@ -316,8 +316,8 @@ pub fn wrap_minusplus_block<'c: 'a, 'a>(
         errhint: &'a str,
     ) -> (usize, usize)
     where
-        ItSyn: Iterator<Item = LineSegments<'a, SyntectStyle>>,
-        ItDiff: Iterator<Item = LineSegments<'a, Style>>,
+        ItSyn: Iterator<Item = LineSections<'a, SyntectStyle>>,
+        ItDiff: Iterator<Item = LineSections<'a, Style>>,
         ItWrap: Iterator<Item = &'a bool>,
     {
         let must_wrap = *wrapinfo_iter
@@ -478,13 +478,13 @@ pub fn wrap_zero_block<'c: 'a, 'a>(
     config: &'c Config,
     raw_line: &str,
     mut states: Vec<State>,
-    syntax_style_sections: Vec<LineSegments<'a, SyntectStyle>>,
-    diff_style_sections: Vec<LineSegments<'a, Style>>,
+    syntax_style_sections: Vec<LineSections<'a, SyntectStyle>>,
+    diff_style_sections: Vec<LineSections<'a, Style>>,
     line_numbers_data: &Option<&mut line_numbers::LineNumbersData>,
 ) -> (
     Vec<State>,
-    Vec<LineSegments<'a, SyntectStyle>>,
-    Vec<LineSegments<'a, Style>>,
+    Vec<LineSections<'a, SyntectStyle>>,
+    Vec<LineSections<'a, Style>>,
 ) {
     // The width is the minimum of the left/right side. The panels should be equally sized,
     // but in rare cases the remaining panel width might differ due to the space the line
@@ -555,7 +555,7 @@ mod tests {
     use super::WrapConfig;
     use crate::ansi::strip_ansi_codes;
     use crate::config::Config;
-    use crate::features::side_by_side::LineSegments;
+    use crate::features::side_by_side::LineSections;
     use crate::style::Style;
     use crate::tests::integration_test_utils::{make_config_from_args, run_delta};
 
@@ -614,7 +614,7 @@ mod tests {
         cfg
     }
 
-    fn wrap_test<'a, I, S>(cfg: &'a Config, line: I, line_width: usize) -> Vec<LineSegments<'a, S>>
+    fn wrap_test<'a, I, S>(cfg: &'a Config, line: I, line_width: usize) -> Vec<LineSections<'a, S>>
     where
         I: IntoIterator<Item = (S, &'a str)> + std::fmt::Debug,
         <I as IntoIterator>::IntoIter: DoubleEndedIterator,
@@ -736,7 +736,7 @@ mod tests {
 
     #[test]
     fn test_wrap_line_newlines<'a>() {
-        fn mk_input(len: usize) -> LineSegments<'static, Style> {
+        fn mk_input(len: usize) -> LineSections<'static, Style> {
             const IN: &str = "0123456789abcdefZ";
             let v = &[*S1, *S2];
             let s1s2 = v.iter().cycle();
@@ -745,18 +745,18 @@ mod tests {
                 .map(|(style, text)| (style.clone(), *text))
                 .collect()
         }
-        fn mk_input_nl(len: usize) -> LineSegments<'static, Style> {
+        fn mk_input_nl(len: usize) -> LineSections<'static, Style> {
             const NL: &str = "\n";
             let mut line = mk_input(len);
             line.push((*S2, NL));
             line
         }
         fn mk_expected<'a>(
-            vec: &LineSegments<'a, Style>,
+            vec: &LineSections<'a, Style>,
             from: usize,
             to: usize,
             append: Option<(Style, &'a str)>,
-        ) -> LineSegments<'a, Style> {
+        ) -> LineSections<'a, Style> {
             let mut result: Vec<_> = vec[from..to].iter().cloned().collect();
             if let Some(val) = append {
                 result.push(val);