ln: simplify backup rollback by replacing closure with if/else

Author: sylvestre

src/uu/ln/src/ln.rs

@@ -438,34 +438,32 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> UResult<()> {
         }
     }
 
-    let res = (|| -> UResult<()> {
-        if settings.symbolic {
-            Ok(symlink(&source, dst)?)
+    let res = if settings.symbolic {
+        symlink(&source, dst).map_err(Into::into)
+    } else {
+        let p = if settings.logical && source.is_symlink() {
+            fs::canonicalize(&source)
+                .map_err_context(|| translate!("ln-failed-to-access", "file" => source.quote()))?
         } else {
-            let p = if settings.logical && source.is_symlink() {
-                fs::canonicalize(&source).map_err_context(
-                    || translate!("ln-failed-to-access", "file" => source.quote()),
-                )?
-            } else {
-                source.to_path_buf()
-            };
-            if let Err(e) = fs::hard_link(&p, dst) {
-                if p.is_dir() {
-                    return Err(LnError::FailedToCreateHardLinkDir(source.to_path_buf()).into());
-                }
-                return Err(e).map_err_context(|| {
-                    translate!("ln-failed-to-create-hard-link", "source" => source.quote(), "dest" => dst.quote())
-                });
+            source.to_path_buf()
+        };
+        match fs::hard_link(&p, dst) {
+            Ok(()) => Ok(()),
+            Err(_) if p.is_dir() => {
+                Err(LnError::FailedToCreateHardLinkDir(source.to_path_buf()).into())
             }
-            Ok(())
+            Err(e) => Err(e).map_err_context(|| {
+                translate!("ln-failed-to-create-hard-link", "source" => source.quote(), "dest" => dst.quote())
+            }),
         }
-    })();
-    if res.is_err() {
+    };
+
+    if let Err(e) = res {
         if let Some(ref p) = backup_path {
             fs::rename(p, dst)
                 .map_err_context(|| translate!("ln-cannot-backup", "file" => dst.quote()))?;
         }
-        res?;
+        return Err(e);
     }
 
     if settings.verbose {