From 227929f9ddd3a5dfdab8a5552f457fd6184d3eb2 Mon Sep 17 00:00:00 2001
From: Craig Disselkoen <craigdissel@gmail.com>
Date: Wed, 6 May 2020 13:28:32 -0700
Subject: simplify by using bail! macro

---
 crates/ra_env/src/lib.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'crates/ra_env')

diff --git a/crates/ra_env/src/lib.rs b/crates/ra_env/src/lib.rs
index a1c4239be..4f94bffde 100644
--- a/crates/ra_env/src/lib.rs
+++ b/crates/ra_env/src/lib.rs
@@ -2,7 +2,7 @@
 //! [`get_path_for_executable`](fn.get_path_for_executable.html).
 //! See docs there for more information.
 
-use anyhow::{Error, Result};
+use anyhow::{bail, Result};
 use std::env;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -27,10 +27,10 @@ pub fn get_path_for_executable(executable_name: impl AsRef<str>) -> Result<PathB
         if is_valid_executable(&path) {
             Ok(path.into())
         } else {
-            Err(Error::msg(format!(
+            bail!(
                 "`{}` environment variable points to something that's not a valid executable",
                 env_var
-            )))
+            )
         }
     } else {
         if is_valid_executable(executable_name) {
@@ -50,7 +50,10 @@ pub fn get_path_for_executable(executable_name: impl AsRef<str>) -> Result<PathB
         // 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)))
+        bail!(
+            "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