Run cargo fmt

src/diffs.rs

@@ -1,6 +1,6 @@
-use colored::*;
 use crate::language::{language_lexer, lex, Language};
 use crate::lines::{LineNumber, LineRange, NewlinePositions, Range};
+use colored::*;
 use std::cmp::min;
 use std::collections::HashMap;
 
@@ -43,7 +43,7 @@ pub fn difference_positions(before_src: &str, after_src: &str, lang: Language) -
                         start: l.start,
                         end: l.start + l.text.len(),
                     },
-                    opposite_line: right_line
+                    opposite_line: right_line,
                 });
             }
             // Present in both.
@@ -59,7 +59,7 @@ pub fn difference_positions(before_src: &str, after_src: &str, lang: Language) -
                         start: r.start,
                         end: r.start + r.text.len(),
                     },
-                    opposite_line: left_line
+                    opposite_line: left_line,
                 });
             }
         }

src/language.rs

@@ -30,7 +30,7 @@ impl Language {
             "js" => Some(Language::JavaScript),
             "lisp" => Some(Language::Lisp),
             "rust" => Some(Language::Rust),
-            _ => None
+            _ => None,
         }
     }
 }

src/lines.rs

@@ -1,7 +1,7 @@
-use std::collections::HashSet;
-use regex::Regex;
 use crate::diffs::Change;
+use regex::Regex;
 use std::cmp::{max, min};
+use std::collections::HashSet;
 
 // TODO: Move to a separate file, this isn't line related.
 /// A range in a string, relative to the string start.
@@ -177,7 +177,7 @@ fn from_ranges_split_over_multiple_lines() {
 #[derive(Debug, PartialEq, Copy, Clone)]
 pub struct MatchedLine {
     pub line: LineNumber,
-    pub opposite_line: LineNumber
+    pub opposite_line: LineNumber,
 }
 
 /// Given a slice of changes, return the unique lines that
@@ -199,7 +199,7 @@ pub fn relevant_lines(changes: &[Change], s: &str) -> Vec<MatchedLine> {
             line_nums_seen.insert(range.line);
             result.push(MatchedLine {
                 line: range.line,
-                opposite_line: change.opposite_line
+                opposite_line: change.opposite_line,
             });
         }
     }
@@ -207,7 +207,11 @@ pub fn relevant_lines(changes: &[Change], s: &str) -> Vec<MatchedLine> {
     result
 }
 
-pub fn add_context(lines: &[MatchedLine], context: usize, max_line: LineNumber) -> Vec<MatchedLine> {
+pub fn add_context(
+    lines: &[MatchedLine],
+    context: usize,
+    max_line: LineNumber,
+) -> Vec<MatchedLine> {
     let mut result: Vec<MatchedLine> = vec![];
 
     for matched_line in lines {
@@ -215,8 +219,9 @@ pub fn add_context(lines: &[MatchedLine], context: usize, max_line: LineNumber)
         // calculate the opposite line number for the context lines,
         // we assume that they line up. Context line -1 should have
         // opposite_line - 1.
-        let opposite_offset = matched_line.opposite_line.number as isize - matched_line.line.number as isize;
-        
+        let opposite_offset =
+            matched_line.opposite_line.number as isize - matched_line.line.number as isize;
+
         let line_number = matched_line.line.number;
         let earliest = max(0, line_number as isize - context as isize) as usize;
         let latest = min(line_number + context, max_line.number);
@@ -229,13 +234,10 @@ pub fn add_context(lines: &[MatchedLine], context: usize, max_line: LineNumber)
                 }
             }
             if is_new {
-                result.push(
-                    MatchedLine {
-                        line: LineNumber::from(i),
-                        opposite_line: LineNumber::from(max(i as isize + opposite_offset, 0) as usize)
-                    }
-
-                );
+                result.push(MatchedLine {
+                    line: LineNumber::from(i),
+                    opposite_line: LineNumber::from(max(i as isize + opposite_offset, 0) as usize),
+                });
             }
         }
     }
@@ -256,12 +258,8 @@ fn test_add_context() {
             opposite_line: LineNumber::from(i),
         }
     }
-    
-    let start_lines = [
-        matched_line(5),
-        matched_line(12),
-        matched_line(14),
-    ];
+
+    let start_lines = [matched_line(5), matched_line(12), matched_line(14)];
     let result = add_context(&start_lines, 2, LineNumber::from(20));
 
     let expected = [
@@ -295,7 +293,7 @@ fn test_add_zero_context() {
         MatchedLine {
             line: LineNumber::from(14),
             opposite_line: LineNumber::from(14),
-        }
+        },
     ];
     let result = add_context(&start_lines, 0, LineNumber::from(20));
 

src/main.rs

@@ -9,10 +9,10 @@ mod diffs;
 mod language;
 mod lines;
 
-use clap::{App, Arg};
 use crate::diffs::{added, difference_positions, highlight_differences, removed};
 use crate::language::{infer_language, Language};
 use crate::lines::{add_context, enforce_length, max_line, relevant_lines, MatchedLine};
+use clap::{App, Arg};
 use std::collections::HashMap;
 use std::fs;
 use std::iter::FromIterator;