Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

5 files changed, 31 insertions, 32 deletions

diff --git a/xtask/src/bin/pre-commit.rs b/xtask/src/bin/pre-commit.rs
index cc6ccb25e..44507fb74 100644
--- a/xtask/src/bin/pre-commit.rs
+++ b/xtask/src/bin/pre-commit.rs
@@ -19,10 +19,10 @@ fn update_staged() -> Result<()> {
         .current_dir(&root)
         .output()?;
     if !output.status.success() {
-        Err(format!(
+        anyhow::bail!(
             "`git diff --diff-filter=MAR --name-only --cached` exited with {}",
             output.status
-        ))?;
+        );
     }
     for line in String::from_utf8(output.stdout)?.lines() {
         run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index 770b55a9a..53f524f42 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -52,7 +52,7 @@ fn update(path: &Path, contents: &str, mode: Mode) -> Result<()> {
         _ => (),
     }
     if mode == Mode::Verify {
-        Err(format!("`{}` is not up-to-date", path.display()))?;
+        anyhow::bail!("`{}` is not up-to-date", path.display());
     }
     eprintln!("updating {}", path.display());
     fs::write(path, contents)?;
@@ -101,10 +101,8 @@ fn do_extract_comment_blocks(text: &str, allow_blocks_with_empty_lins: bool) ->
         let is_comment = line.starts_with(prefix);
         if is_comment {
             block.push(line[prefix.len()..].to_string());
-        } else {
-            if !block.is_empty() {
-                res.push(mem::replace(&mut block, Vec::new()))
-            }
+        } else if !block.is_empty() {
+            res.push(mem::replace(&mut block, Vec::new()));
         }
     }
     if !block.is_empty() {
diff --git a/xtask/src/codegen/gen_parser_tests.rs b/xtask/src/codegen/gen_parser_tests.rs
index d0f0f683b..2977da2fa 100644
--- a/xtask/src/codegen/gen_parser_tests.rs
+++ b/xtask/src/codegen/gen_parser_tests.rs
@@ -102,10 +102,10 @@ fn tests_from_dir(dir: &Path) -> Result<Tests> {
         for test in collect_tests(&text) {
             if test.ok {
                 if let Some(old_test) = res.ok.insert(test.name.clone(), test) {
-                    return Err(format!("Duplicate test: {}", old_test.name).into());
+                    anyhow::bail!("Duplicate test: {}", old_test.name);
                 }
             } else if let Some(old_test) = res.err.insert(test.name.clone(), test) {
-                return Err(format!("Duplicate test: {}", old_test.name).into());
+                anyhow::bail!("Duplicate test: {}", old_test.name);
             }
         }
         Ok(())
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index bae4c4650..bfee2f9c8 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -2,10 +2,10 @@
 
 pub mod codegen;
 
+use anyhow::Context;
+pub use anyhow::Result;
 use std::{
-    env,
-    error::Error,
-    fs,
+    env, fs,
     io::{Error as IoError, ErrorKind},
     path::{Path, PathBuf},
     process::{Command, Output, Stdio},
@@ -13,8 +13,6 @@ use std::{
 
 use crate::codegen::Mode;
 
-pub type Result<T> = std::result::Result<T, Box<dyn Error>>;
-
 const TOOLCHAIN: &str = "stable";
 
 pub fn project_root() -> PathBuf {
@@ -69,7 +67,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
         .status()
     {
         Ok(status) if status.success() => (),
-        _ => install_rustfmt()?,
+        _ => install_rustfmt().context("install rustfmt")?,
     };
 
     if mode == Mode::Verify {
@@ -112,7 +110,7 @@ pub fn run_clippy() -> Result<()> {
         .status()
     {
         Ok(status) if status.success() => (),
-        _ => install_clippy()?,
+        _ => install_clippy().context("install clippy")?,
     };
 
     let allowed_lints = [
@@ -162,9 +160,9 @@ where
     let exec = args.next().unwrap();
     let mut cmd = Command::new(exec);
     f(cmd.args(args).current_dir(proj_dir).stderr(Stdio::inherit()));
-    let output = cmd.output()?;
+    let output = cmd.output().with_context(|| format!("running `{}`", cmdline))?;
     if !output.status.success() {
-        Err(format!("`{}` exited with {}", cmdline, output.status))?;
+        anyhow::bail!("`{}` exited with {}", cmdline, output.status);
     }
     Ok(output)
 }
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 16bddfb28..f14e6c8ae 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -9,6 +9,7 @@
 //! `.cargo/config`.
 mod help;
 
+use anyhow::Context;
 use core::fmt::Write;
 use core::str;
 use pico_args::Arguments;
@@ -19,7 +20,7 @@ use xtask::{
 };
 
 // Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 38;
+const REQUIRED_RUST_VERSION: u32 = 39;
 
 struct InstallOpt {
     client: Option<ClientOpt>,
@@ -113,21 +114,21 @@ fn handle_extra_flags(e: pico_args::Error) -> Result<()> {
             write!(&mut invalid_flags, "{}, ", flag)?;
         }
         let (invalid_flags, _) = invalid_flags.split_at(invalid_flags.len() - 2);
-        Err(format!("Invalid flags: {}", invalid_flags).into())
+        anyhow::bail!("Invalid flags: {}", invalid_flags)
     } else {
-        Err(e.to_string().into())
+        anyhow::bail!(e.to_string())
     }
 }
 
 fn install(opts: InstallOpt) -> Result<()> {
     if cfg!(target_os = "macos") {
-        fix_path_for_mac()?
+        fix_path_for_mac().context("Fix path for mac")?
     }
     if let Some(server) = opts.server {
-        install_server(server)?;
+        install_server(server).context("install server")?;
     }
     if let Some(client) = opts.client {
-        install_client(client)?;
+        install_client(client).context("install client")?;
     }
     Ok(())
 }
@@ -139,7 +140,7 @@ fn fix_path_for_mac() -> Result<()> {
         const ROOT_DIR: &str = "";
         let home_dir = match env::var("HOME") {
             Ok(home) => home,
-            Err(e) => Err(format!("Failed getting HOME from environment with error: {}.", e))?,
+            Err(e) => anyhow::bail!("Failed getting HOME from environment with error: {}.", e),
         };
 
         [ROOT_DIR, &home_dir]
@@ -153,12 +154,12 @@ fn fix_path_for_mac() -> Result<()> {
     if !vscode_path.is_empty() {
         let vars = match env::var_os("PATH") {
             Some(path) => path,
-            None => Err("Could not get PATH variable from env.")?,
+            None => anyhow::bail!("Could not get PATH variable from env."),
         };
 
         let mut paths = env::split_paths(&vars).collect::<Vec<_>>();
         paths.append(&mut vscode_path);
-        let new_paths = env::join_paths(paths)?;
+        let new_paths = env::join_paths(paths).context("build env PATH")?;
         env::set_var("PATH", &new_paths);
     }
 
@@ -197,7 +198,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 
     let code_binary = match code_binary {
         Some(it) => it,
-        None => Err("Can't execute `code --version`. Perhaps it is not in $PATH?")?,
+        None => anyhow::bail!("Can't execute `code --version`. Perhaps it is not in $PATH?"),
     };
 
     Cmd {
@@ -218,8 +219,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     .run_with_output()?;
 
     if !str::from_utf8(&output.stdout)?.contains("ra-lsp") {
-        Err("Could not install the Visual Studio Code extension. \
-             Please make sure you have at least NodeJS 10.x installed and try again.")?;
+        anyhow::bail!(
+            "Could not install the Visual Studio Code extension. \
+             Please make sure you have at least NodeJS 10.x installed and try again."
+        );
     }
 
     Ok(())
@@ -239,7 +242,7 @@ fn install_server(opts: ServerOpt) -> Result<()> {
     if old_rust {
         eprintln!(
             "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION
+            REQUIRED_RUST_VERSION,
         )
     }
 
@@ -252,7 +255,7 @@ fn install_server(opts: ServerOpt) -> Result<()> {
     if res.is_err() && old_rust {
         eprintln!(
             "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION
+            REQUIRED_RUST_VERSION,
         )
     }