diff --git a/examples/example.rs b/examples/example.rs index c4a8aff..a97c6ea 100644 --- a/examples/example.rs +++ b/examples/example.rs @@ -9,14 +9,14 @@ fn main() { let first_text = "one two three four".split(" ").collect::>(); let second_text = "zero one tree four".split(" ").collect::>(); let diff = difflib::unified_diff(&first_text, &second_text, "Original", "Current", - "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3, ""); + "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3); for line in &diff { println!("{:?}", line); } //context_diff let diff = difflib::context_diff(&first_text, &second_text, "Original", "Current", - "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3, ""); + "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3); for line in &diff { println!("{:?}", line); } diff --git a/src/lib.rs b/src/lib.rs index 85544ca..e35731e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,8 +27,9 @@ pub fn get_close_matches<'a>(word: &str, possibilities: Vec<&'a str>, n: usize, } pub fn unified_diff(first_sequence: &T, second_sequence: &T, from_file: &str, to_file: &str, - from_file_date: &str, to_file_date: &str, n: usize, lineterm: &str) -> Vec { + from_file_date: &str, to_file_date: &str, n: usize) -> Vec { let mut res = Vec::new(); + let lineterm = '\n'; let mut started = false; let mut matcher = SequenceMatcher::new(first_sequence, second_sequence); for group in &matcher.get_grouped_opcodes(n) { @@ -67,8 +68,9 @@ pub fn unified_diff(first_sequence: &T, second_sequence: &T, from_f pub fn context_diff(first_sequence: &T, second_sequence: &T, from_file: &str, to_file: &str, - from_file_date: &str, to_file_date: &str, n: usize, lineterm: &str) -> Vec { + from_file_date: &str, to_file_date: &str, n: usize) -> Vec { let mut res = Vec::new(); + let lineterm = '\n'; let mut prefix: HashMap = HashMap::new(); prefix.insert(String::from("insert"), String::from("+ ")); prefix.insert(String::from("delete"), String::from("- ")); diff --git a/tests/test.rs b/tests/test.rs index 7904eb6..4f4c604 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -134,8 +134,8 @@ fn test_unified_diff() { let first_text = "one two three four".split(" ").collect::>(); let second_text = "zero one tree four".split(" ").collect::>(); let result = difflib::unified_diff(&first_text, &second_text, "Original", "Current", - "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3, "").join(""); - assert_eq!(result, "--- Original\t2005-01-26 23:30:50+++ Current\t2010-04-02 10:20:52@@ -1,4 +1,4 @@+zero one-two-three+tree four"); + "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3).join(""); + assert_eq!(result, "--- Original\t2005-01-26 23:30:50\n+++ Current\t2010-04-02 10:20:52\n@@ -1,4 +1,4 @@\n+zero one-two-three+tree four"); } #[test] @@ -143,6 +143,6 @@ fn test_context_diff() { let first_text = "one two three four".split(" ").collect::>(); let second_text = "zero one tree four".split(" ").collect::>(); let result = difflib::context_diff(&first_text, &second_text, "Original", "Current", - "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3, "").join(""); - assert_eq!(result, "*** Original\t2005-01-26 23:30:50--- Current\t2010-04-02 10:20:52****************** 1,4 **** one! two! three four--- 1,4 ----+ zero one! tree four"); + "2005-01-26 23:30:50", "2010-04-02 10:20:52", 3).join(""); + assert_eq!(result, "*** Original\t2005-01-26 23:30:50\n--- Current\t2010-04-02 10:20:52\n***************\n*** 1,4 ****\n one! two! three four--- 1,4 ----\n+ zero one! tree four"); } \ No newline at end of file