formatting

Author: gcanat

text/diff_util/change.rs

@@ -21,7 +21,6 @@ pub enum Change {
 }
 
 impl Change {
-
     pub fn get_ln1(&self) -> usize {
         match self {
             Change::None => panic!("Change::None is not allowed in hunk."),

text/diff_util/dir_diff.rs

@@ -48,11 +48,15 @@ impl<'a> DirDiff<'a> {
             let is_file = dir_data
                 .files()
                 .get_key_value(file_name)
-                .unwrap_or_else(|| panic!("Could not find file in {}",
+                .unwrap_or_else(|| {
+                    panic!(
+                        "Could not find file in {}",
                         dir_data
-                        .path()
-                        .to_str()
-                        .unwrap_or(COULD_NOT_UNWRAP_FILENAME)))
+                            .path()
+                            .to_str()
+                            .unwrap_or(COULD_NOT_UNWRAP_FILENAME)
+                    )
+                })
                 .1
                 .file_type()?
                 .is_file();

text/diff_util/file_data.rs

@@ -1,11 +1,4 @@
-use std::{
-    fs::File,
-    io,
-    mem::take,
-    path::PathBuf,
-    str::from_utf8,
-    time::SystemTime,
-};
+use std::{fs::File, io, mem::take, path::PathBuf, str::from_utf8, time::SystemTime};
 
 use super::constants::COULD_NOT_UNWRAP_FILENAME;
 
@@ -22,7 +15,11 @@ impl<'a> FileData<'a> {
         self.ends_with_newline
     }
 
-    pub fn get_file(path: PathBuf, lines: Vec<&'a str>, ends_with_newline: bool) -> io::Result<Self> {
+    pub fn get_file(
+        path: PathBuf,
+        lines: Vec<&'a str>,
+        ends_with_newline: bool,
+    ) -> io::Result<Self> {
         let file = File::open(&path)?;
         let modified = file.metadata()?.modified()?;
 
@@ -69,7 +66,10 @@ pub struct LineReader<'a> {
 impl<'a> LineReader<'a> {
     pub fn new(content: &'a [u8]) -> Self {
         let ends_with_newline = content.last() == Some(&b'\n');
-        Self { content, ends_with_newline }
+        Self {
+            content,
+            ends_with_newline,
+        }
     }
     pub fn ends_with_newline(&self) -> bool {
         self.ends_with_newline
@@ -100,5 +100,4 @@ impl<'a> Iterator for LineReader<'a> {
         self.content = rest;
         Some(from_utf8(&line[..line_len - 1]).expect("Failed to convert to str"))
     }
-
 }

text/diff_util/hunks.rs

@@ -39,7 +39,7 @@ impl Hunk {
         } else if is_ed && (self.ln1_start == self.ln1_end - 1) {
             format!("{}", self.ln1_end)
         } else {
-            format!("{},{}", self.ln1_start+1, self.ln1_end)
+            format!("{},{}", self.ln1_start + 1, self.ln1_end)
         }
     }
 
@@ -49,7 +49,7 @@ impl Hunk {
         } else if is_ed && (self.ln2_start == self.ln2_end - 1) {
             format!("{}", self.ln2_end)
         } else {
-            format!("{},{}", self.ln2_start+1, self.ln2_end)
+            format!("{},{}", self.ln2_start + 1, self.ln2_end)
         }
     }
 
@@ -213,7 +213,10 @@ pub struct Hunks {
 impl Hunks {
     pub fn new() -> Self {
         Self {
-            hunks: { Hunk::new(); vec![] as Vec<Hunk>},
+            hunks: {
+                Hunk::new();
+                vec![] as Vec<Hunk>
+            },
         }
     }
 
@@ -253,7 +256,11 @@ impl Hunks {
                 } else {
                     (prev_val + 1) as usize
                 };
-            } else if (i != 0) && (prev_val != -1) && (lcs_index != &-1) && (lcs_index != &(prev_val + 1)) {
+            } else if (i != 0)
+                && (prev_val != -1)
+                && (lcs_index != &-1)
+                && (lcs_index != &(prev_val + 1))
+            {
                 // there was an insertion (but no deletion)
                 // no -1 values but a bump in the values, eg [136, 145]
                 hunk_start1 = i;