diff --git a/bin/diffutils/params.rs b/bin/diffutils/params.rs index 1c0dcf1..9c1517a 100644 --- a/bin/diffutils/params.rs +++ b/bin/diffutils/params.rs @@ -33,7 +33,7 @@ pub fn parse_params>(opts: I) -> Result from, None => { - return Err(format!("Usage: ")); + return Err("Usage: ".to_string()); } }; let mut from = None; @@ -55,8 +55,8 @@ pub fn parse_params>(opts: I) -> Result>(opts: I) -> Result { context_count = (b - b'0') as usize; while let Some(b'0'..=b'9') = bit.peek() { - context_count = context_count * 10; + context_count *= 10; context_count += (bit.next().unwrap() - b'0') as usize; } } b'c' => { if format.is_some() && format != Some(Format::Context) { - return Err(format!("Conflicting output style options")); + return Err("Conflicting output style options".to_string()); } format = Some(Format::Context); } b'e' => { if format.is_some() && format != Some(Format::Ed) { - return Err(format!("Conflicting output style options")); + return Err("Conflicting output style options".to_string()); } format = Some(Format::Ed); } b'u' => { if format.is_some() && format != Some(Format::Unified) { - return Err(format!("Conflicting output style options")); + return Err("Conflicting output style options".to_string()); } format = Some(Format::Unified); } b'U' => { if format.is_some() && format != Some(Format::Unified) { - return Err(format!("Conflicting output style options")); + return Err("Conflicting output style options".to_string()); } format = Some(Format::Unified); let context_count_maybe = if bit.peek().is_some() { @@ -102,7 +102,7 @@ pub fn parse_params>(opts: I) -> Result return Err(format!("Unknown option: {}", String::from_utf8_lossy(&[b]))), diff --git a/lib/context-diff/src/lib.rs b/lib/context-diff/src/lib.rs index 4974c8d..38eee45 100644 --- a/lib/context-diff/src/lib.rs +++ b/lib/context-diff/src/lib.rs @@ -1,6 +1,6 @@ use std::collections::VecDeque; use std::io::Write; -use std::mem; + #[derive(Debug, PartialEq)] pub enum DiffLine { @@ -106,7 +106,7 @@ fn make_diff(expected: &[u8], actual: &[u8], context_size: usize) -> Vec Vec Vec Result, DiffError> debug_assert_eq!(b"".split(|&c| c == b'\n').count(), 1); // ^ means that underflow here is impossible - let expected_lines_count = expected_lines.len() - 1; - let actual_lines_count = actual_lines.len() - 1; + let _expected_lines_count = expected_lines.len() - 1; + let _actual_lines_count = actual_lines.len() - 1; if expected_lines.last() == Some(&&b""[..]) { expected_lines.pop(); @@ -66,7 +66,7 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Result, DiffError> for result in diff::slice(&expected_lines, &actual_lines) { match result { diff::Result::Left(str) => { - if mismatch.actual.len() != 0 { + if !mismatch.actual.is_empty() { results.push(mismatch); mismatch = Mismatch::new(line_number_expected, line_number_actual); } @@ -77,10 +77,10 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Result, DiffError> mismatch.actual.push(str.to_vec()); line_number_actual += 1; } - diff::Result::Both(str, _) => { + diff::Result::Both(_str, _) => { line_number_expected += 1; line_number_actual += 1; - if mismatch.actual.len() != 0 || mismatch.expected.len() != 0 { + if !mismatch.actual.is_empty() || !mismatch.expected.is_empty() { results.push(mismatch); mismatch = Mismatch::new(line_number_expected, line_number_actual); } else { @@ -91,7 +91,7 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Result, DiffError> } } - if mismatch.actual.len() != 0 || mismatch.expected.len() != 0 { + if !mismatch.actual.is_empty() || !mismatch.expected.is_empty() { results.push(mismatch); } @@ -104,7 +104,7 @@ pub fn diff(expected: &[u8], actual: &[u8]) -> Result, DiffError> { let mut lines_offset = 0; for result in diff_results { let line_number_expected: isize = result.line_number_expected as isize + lines_offset; - let line_number_actual: isize = result.line_number_actual as isize + lines_offset; + let _line_number_actual: isize = result.line_number_actual as isize + lines_offset; let expected_count: isize = result.expected.len() as isize; let actual_count: isize = result.actual.len() as isize; match (expected_count, actual_count) { @@ -137,13 +137,13 @@ pub fn diff(expected: &[u8], actual: &[u8]) -> Result, DiffError> { writeln!(&mut output, "..\n.\ns/.//\na").unwrap(); } else { output.write_all(actual).unwrap(); - writeln!(&mut output, "").unwrap(); + writeln!(&mut output).unwrap(); } } writeln!(&mut output, ".").unwrap(); } } - return Ok(output) + Ok(output) } pub fn diff_w(expected: &[u8], actual: &[u8], filename: &str) -> Result, DiffError> { diff --git a/lib/normal-diff/src/lib.rs b/lib/normal-diff/src/lib.rs index 14ee175..5b5d5bc 100644 --- a/lib/normal-diff/src/lib.rs +++ b/lib/normal-diff/src/lib.rs @@ -49,7 +49,7 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Vec { for result in diff::slice(&expected_lines, &actual_lines) { match result { diff::Result::Left(str) => { - if mismatch.actual.len() != 0 && !mismatch.actual_missing_nl { + if !mismatch.actual.is_empty() && !mismatch.actual_missing_nl { results.push(mismatch); mismatch = Mismatch::new(line_number_expected, line_number_actual); } @@ -81,7 +81,7 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Vec { (true, true) | (false, false) => { line_number_expected += 1; line_number_actual += 1; - if mismatch.actual.len() != 0 || mismatch.expected.len() != 0 { + if !mismatch.actual.is_empty() || !mismatch.expected.is_empty() { results.push(mismatch); mismatch = Mismatch::new(line_number_expected, line_number_actual); } else { @@ -94,7 +94,7 @@ fn make_diff(expected: &[u8], actual: &[u8]) -> Vec { } } - if mismatch.actual.len() != 0 || mismatch.expected.len() != 0 { + if !mismatch.actual.is_empty() || !mismatch.expected.is_empty() { results.push(mismatch); } @@ -140,7 +140,7 @@ pub fn diff(expected: &[u8], actual: &[u8]) -> Vec { for expected in &result.expected { write!(&mut output, "< ").unwrap(); output.write_all(expected).unwrap(); - writeln!(&mut output, "").unwrap(); + writeln!(&mut output).unwrap(); } if result.expected_missing_nl { writeln!(&mut output, r"\ No newline at end of file").unwrap(); @@ -151,7 +151,7 @@ pub fn diff(expected: &[u8], actual: &[u8]) -> Vec { for actual in &result.actual { write!(&mut output, "> ").unwrap(); output.write_all(actual).unwrap(); - writeln!(&mut output, "").unwrap(); + writeln!(&mut output).unwrap(); } if result.actual_missing_nl { writeln!(&mut output, r"\ No newline at end of file").unwrap(); diff --git a/lib/unified-diff/src/lib.rs b/lib/unified-diff/src/lib.rs index a9f29a1..0caecf5 100644 --- a/lib/unified-diff/src/lib.rs +++ b/lib/unified-diff/src/lib.rs @@ -180,7 +180,7 @@ fn make_diff(expected: &[u8], actual: &[u8], context_size: usize) -> Vec