cargo clippy

nicokoch · Apr 3, 2019 · 724b498 · 724b498
1 parent d50b820
commit 724b498
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -65,9 +65,9 @@ pub fn reflink<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()>
 /// }
 /// ```
 pub fn reflink_or_copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<Option<u64>> {
-    match reflink(&from, &to) {
-        Ok(()) => return Ok(None),
-        Err(_) => {}
+    if let Ok(()) = reflink(&from, &to) {
+        Ok(None)
+    } else {
+        fs::copy(from, to).map(Some)
     }
-    fs::copy(from, to).map(|written| Some(written))
 }
diff --git a/src/sys/unix.rs b/src/sys/unix.rs
@@ -54,8 +54,8 @@ pub fn reflink(from: &Path, to: &Path) -> io::Result<()> {
         ) -> libc::c_int;
     }
 
-    let src = cstr(from.as_ref())?;
-    let dest = cstr(to.as_ref())?;
+    let src = cstr(from)?;
+    let dest = cstr(to)?;
 
     let ret = unsafe { clonefile(src.as_ptr(), dest.as_ptr(), CLONE_NOOWNERCOPY) };