Merge pull request #28 from breezy-team/unused-import

Remove unused import
breezy-team · Nov 17, 2024 · c177b92 · c177b92
2 parents 95c0f54 + 640c924
commit c177b92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/ed.rs b/src/ed.rs
@@ -10,9 +10,7 @@ pub struct EdPatch {
 impl crate::ContentPatch for EdPatch {
     fn apply_exact(&self, orig: &[u8]) -> Result<Vec<u8>, crate::ApplyError> {
         let lines = splitlines(orig).collect::<Vec<_>>();
-        let result = self
-            .apply(&lines)
-            .map_err(|e| crate::ApplyError::Conflict(e))?;
+        let result = self.apply(&lines).map_err(crate::ApplyError::Conflict)?;
         Ok(result)
     }
 }
@@ -27,7 +25,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!(

diff --git a/src/unified.rs b/src/unified.rs
@@ -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