Skip to content

Commit

Permalink
Remove unused import
Browse files Browse the repository at this point in the history
  • Loading branch information
jelmer committed Nov 17, 2024
1 parent 95c0f54 commit a13069f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/ed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ impl crate::ContentPatch for EdPatch {
let lines = splitlines(orig).collect::<Vec<_>>();
let result = self
.apply(&lines)
.map_err(|e| crate::ApplyError::Conflict(e))?;
.map_err(crate::ApplyError::Conflict)?;
Ok(result)
}
}
Expand All @@ -27,7 +27,7 @@ impl EdPatch {
assert_eq!(start, end);
let existing = match data.get(start - 1) {
Some(existing) => existing,
None => return Err(format!("line {} does not exist", start).into()),
None => return Err(format!("line {} does not exist", start)),
};
if existing != expected {
return Err(format!(
Expand Down
1 change: 0 additions & 1 deletion src/unified.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//! Parsing of unified patches
use crate::{ContentPatch, SingleFilePatch};
use regex::bytes::Regex;
use std::num::ParseIntError;

/// Errors that can occur while parsing a patch
Expand Down

0 comments on commit a13069f

Please sign in to comment.