Replace match with function chaining

Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>

1 files changed, 11 insertions, 13 deletions

diff --git a/crates/common/flockfile/src/unix.rs b/crates/common/flockfile/src/unix.rs
index ce0e29f0..c3cfebe0 100644
--- a/crates/common/flockfile/src/unix.rs
+++ b/crates/common/flockfile/src/unix.rs
@@ -44,24 +44,22 @@ impl Flockfile {
     ///
     pub fn new_lock(path: impl AsRef<Path>) -> Result<Flockfile, FlockfileError> {
         let path = PathBuf::new().join(path);
-        let file = match OpenOptions::new()
+        let file = OpenOptions::new()
             .create(true)
             .read(true)
             .write(true)
             .open(&path)
-        {
-            Ok(file) => file,
-            Err(err) => {
-                return Err(FlockfileError::FromIo { path, source: err });
-            }
-        };
-
-        match flock(file.as_raw_fd(), FlockArg::LockExclusiveNonblock) {
-            Ok(()) => (),
-            Err(err) => {
-                return Err(FlockfileError::FromNix { path, source: err });
+            .map_err(|err| FlockfileError::FromIo {
+                path: path.clone(),
+                source: err,
+            })?;
+
+        flock(file.as_raw_fd(), FlockArg::LockExclusiveNonblock).map_err(|err| {
+            FlockfileError::FromNix {
+                path: path.clone(),
+                source: err,
             }
-        };
+        })?;
 
         info!(r#"Lockfile created {:?}"#, &path);
         Ok(Flockfile {