From 1b76b4281e90292922455a9192f82a2b6b80d279 Mon Sep 17 00:00:00 2001
From: Craig Disselkoen <craigdissel@gmail.com>
Date: Tue, 5 May 2020 16:09:39 -0700
Subject: simplify some code using early returns

---
 crates/ra_env/src/lib.rs | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'crates/ra_env/src')

diff --git a/crates/ra_env/src/lib.rs b/crates/ra_env/src/lib.rs
index c7b49e997..8d6aa9268 100644
--- a/crates/ra_env/src/lib.rs
+++ b/crates/ra_env/src/lib.rs
@@ -33,31 +33,24 @@ pub fn get_path_for_executable(executable_name: impl AsRef<str>) -> Result<Strin
             )))
         }
     } else {
-        let final_path: Option<String> = if is_valid_executable(executable_name) {
-            Some(executable_name.to_owned())
-        } else {
-            if let Some(mut path) = dirs::home_dir() {
-                path.push(".cargo");
-                path.push("bin");
-                path.push(executable_name);
-                if is_valid_executable(&path) {
-                    Some(path.into_os_string().into_string().expect("Invalid Unicode in path"))
-                } else {
-                    None
-                }
-            } else {
-                None
+        if is_valid_executable(executable_name) {
+            return Ok(executable_name.to_owned());
+        }
+        if let Some(mut path) = dirs::home_dir() {
+            path.push(".cargo");
+            path.push("bin");
+            path.push(executable_name);
+            if is_valid_executable(&path) {
+                return Ok(path.into_os_string().into_string().expect("Invalid Unicode in path"));
             }
-        };
-        final_path.ok_or(
-            // This error message may also be caused by $PATH or $CARGO/$RUSTC/etc not being set correctly
-            // for VSCode, even if they are set correctly in a terminal.
-            // On macOS in particular, launching VSCode from terminal with `code <dirname>` causes VSCode
-            // to inherit environment variables including $PATH, $CARGO, $RUSTC, etc from that terminal;
-            // but launching VSCode from Dock does not inherit environment variables from a terminal.
-            // For more discussion, see #3118.
-            Error::msg(format!("Failed to find `{}` executable. Make sure `{}` is in `$PATH`, or set `${}` to point to a valid executable.", executable_name, executable_name, env_var))
-        )
+        }
+        // This error message may also be caused by $PATH or $CARGO/$RUSTC/etc not being set correctly
+        // for VSCode, even if they are set correctly in a terminal.
+        // On macOS in particular, launching VSCode from terminal with `code <dirname>` causes VSCode
+        // to inherit environment variables including $PATH, $CARGO, $RUSTC, etc from that terminal;
+        // but launching VSCode from Dock does not inherit environment variables from a terminal.
+        // For more discussion, see #3118.
+        Err(Error::msg(format!("Failed to find `{}` executable. Make sure `{}` is in `$PATH`, or set `${}` to point to a valid executable.", executable_name, executable_name, env_var)))
     }
 }
 
-- 
cgit v1.2.3