diff: Remove changes

Author: fox0

text/diff_util/file_diff.rs

@@ -24,10 +24,32 @@ pub struct FileDiff<'a> {
     file2: &'a mut FileData<'a>,
     hunks: Hunks,
     format_options: &'a FormatOptions,
-    pub are_different: bool,
+    are_different: bool,
 }
 
 impl<'a> FileDiff<'a> {
+    pub fn are_different(&self) -> bool {
+        self.are_different
+    }
+
+    pub fn set_different(&mut self, are_different: bool) {
+        self.are_different = are_different;
+    }
+
+    fn new(
+        file1: &'a mut FileData<'a>,
+        file2: &'a mut FileData<'a>,
+        format_options: &'a FormatOptions,
+    ) -> Self {
+        Self {
+            file1,
+            file2,
+            hunks: Hunks::new(),
+            format_options,
+            are_different: false,
+        }
+    }
+
     pub fn file_diff(
         path1: PathBuf,
         path2: PathBuf,
@@ -63,13 +85,7 @@ impl<'a> FileDiff<'a> {
             let mut file1 = FileData::get_file(path1, lines1, ends_with_newline1)?;
             let mut file2 = FileData::get_file(path2, lines2, ends_with_newline2)?;
 
-            let mut diff = FileDiff {
-                file1: &mut file1,
-                file2: &mut file2,
-                hunks: Default::default(),
-                format_options,
-                are_different: Default::default(),
-            };
+            let mut diff = FileDiff::new(&mut file1, &mut file2, format_options);
 
             // histogram diff
             let mut lcs_indices: Vec<i32> = vec![-1; diff.file1.lines().len()];
@@ -89,10 +105,10 @@ impl<'a> FileDiff<'a> {
                 .create_hunks_from_lcs(&lcs_indices, num_lines1, num_lines2);
 
             if diff.hunks.hunk_count() > 0 {
-                diff.are_different = true;
+                diff.set_different(true);
             }
 
-            if diff.are_different {
+            if diff.are_different() {
                 if let Some(show_if_different) = show_if_different {
                     println!("{}", show_if_different);
                 }
@@ -200,7 +216,7 @@ impl<'a> FileDiff<'a> {
             }
         }
 
-        if self.are_different {
+        if self.are_different() {
             Ok(DiffExitStatus::Different)
         } else {
             Ok(DiffExitStatus::NotDifferent)
@@ -315,7 +331,7 @@ impl<'a> FileDiff<'a> {
             Self::get_header(self.file2, self.format_options.label2())
         );
 
-        let mut diff_disp = ContextDiffDisplay::default();
+        let mut diff_disp = ContextDiffDisplay::new();
 
         for hunk in self.hunks.hunks() {
             // move cursor to the start of context for first hunk
@@ -442,7 +458,7 @@ impl<'a> FileDiff<'a> {
             Self::get_header(self.file2, self.format_options.label2())
         );
 
-        let mut diff_disp = UnifiedDiffDisplay::default();
+        let mut diff_disp = UnifiedDiffDisplay::new();
 
         for hunk in self.hunks.hunks() {
             // move cursor to the start of context for first hunk
@@ -510,7 +526,6 @@ impl<'a> FileDiff<'a> {
     }
 }
 
-#[derive(Default)]
 pub struct UnifiedDiffDisplay {
     curr_pos1: usize,
     curr_pos2: usize,
@@ -525,6 +540,18 @@ pub struct UnifiedDiffDisplay {
 }
 
 impl UnifiedDiffDisplay {
+    pub fn new() -> Self {
+        Self {
+            curr_pos1: 0,
+            curr_pos2: 0,
+            context_start1: 0,
+            context_start2: 0,
+            hunk1_len: 0,
+            hunk2_len: 0,
+            hunk_lines: String::new(),
+        }
+    }
+
     pub fn write_line(
         &mut self,
         file: &FileData,
@@ -580,7 +607,6 @@ impl UnifiedDiffDisplay {
     }
 }
 
-#[derive(Default)]
 pub struct ContextDiffDisplay {
     curr_pos1: usize,
     curr_pos2: usize,
@@ -595,6 +621,18 @@ pub struct ContextDiffDisplay {
 }
 
 impl ContextDiffDisplay {
+    pub fn new() -> Self {
+        Self {
+            curr_pos1: 0,
+            curr_pos2: 0,
+            context_start1: 0,
+            context_start2: 0,
+            hunk1_len: 0,
+            hunk2_len: 0,
+            hunk_lines: [String::new(), String::new()],
+        }
+    }
+
     pub fn set_context_start(&mut self) {
         self.context_start1 = self.curr_pos1 + 1;
         self.context_start2 = self.curr_pos2 + 1;

text/diff_util/hunks.rs

@@ -33,6 +33,10 @@ impl Default for Hunk {
 }
 
 impl Hunk {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
     pub fn f1_range(&self, is_ed: bool) -> String {
         if self.ln1_start == self.ln1_end {
             format!("{}", self.ln1_start)
@@ -189,12 +193,20 @@ impl Hunk {
     }
 }
 
-#[derive(Default)]
 pub struct Hunks {
     hunks: Vec<Hunk>,
 }
 
 impl Hunks {
+    pub fn new() -> Self {
+        Self {
+            hunks: {
+                Hunk::new();
+                vec![] as Vec<Hunk>
+            },
+        }
+    }
+
     pub fn hunks(&self) -> &Vec<Hunk> {
         &self.hunks
     }