Move off direct failure usage

Author: Mark-Simulacrum

Cargo.lock

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 clap = "2.25"
 env_logger = "0.7"
-failure = "0.1.6"
+anyhow = "1"
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

collector/Cargo.toml

@@ -6,7 +6,7 @@ use std::{
     time::{Duration, SystemTime},
 };
 
-pub fn get_commit_or_fake_it(sha: &str) -> Result<Commit, failure::Error> {
+pub fn get_commit_or_fake_it(sha: &str) -> anyhow::Result<Commit> {
     Ok(get_rust_commits()?
         .iter()
         .find(|c| c.sha == sha)
@@ -21,7 +21,7 @@ pub fn get_commit_or_fake_it(sha: &str) -> Result<Commit, failure::Error> {
 }
 
 /// This retrieves the list of Rust commits which may be available in the CI S3 bucket.
-pub fn get_rust_commits() -> Result<Vec<Commit>, failure::Error> {
+pub fn get_rust_commits() -> anyhow::Result<Vec<Commit>> {
     let repo_dir =
         PathBuf::from(env::var("RUST_SRC_REPO").unwrap_or_else(|_| String::from("rust.git")));
 

collector/src/git.rs

@@ -642,25 +642,25 @@ pub mod round_float {
     }
 }
 
-pub fn run_command(cmd: &mut Command) -> Result<(), failure::Error> {
+pub fn run_command(cmd: &mut Command) -> anyhow::Result<()> {
     log::trace!("running: {:?}", cmd);
     let status = cmd.status()?;
     if !status.success() {
-        failure::bail!("expected success {:?}", status);
+        return Err(anyhow::anyhow!("expected success {:?}", status));
     }
     Ok(())
 }
 
-pub fn command_output(cmd: &mut Command) -> Result<process::Output, failure::Error> {
+pub fn command_output(cmd: &mut Command) -> anyhow::Result<process::Output> {
     log::trace!("running: {:?}", cmd);
     let output = cmd.output()?;
     if !output.status.success() {
-        failure::bail!(
+        return Err(anyhow::anyhow!(
             "expected success, got {}\n\nstderr={}\n\n stdout={}",
             output.status,
             String::from_utf8_lossy(&output.stderr),
             String::from_utf8_lossy(&output.stdout)
-        );
+        ));
     }
     Ok(output)
 }

collector/src/lib.rs

@@ -6,7 +6,8 @@ edition = '2018'
 
 [dependencies]
 env_logger = "0.7"
-failure = "0.1"
+anyhow = "1"
+thiserror = "1"
 futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }
 log = "0.4"
 serde = "1"

site/Cargo.toml

@@ -11,21 +11,20 @@ use std::path::Path;
 use std::process::Command;
 
 use crate::CommandFailed;
-use failure::Error;
 
 const BRANCH: &'static str = "master";
 const GIT: &'static str = "git";
 const GIT_CHECKOUT: &'static str = "checkout";
 const GIT_PULL: &'static str = "pull";
 
-pub fn update_repo(repo_path: &str) -> Result<(), Error> {
+pub fn update_repo(repo_path: &str) -> anyhow::Result<()> {
     let working_dir = Path::new(repo_path);
     checkout_master(working_dir)?;
     pull_updates(working_dir)?;
     Ok(())
 }
 
-pub fn execute_command(working_dir: &Path, args: &[&str]) -> Result<(), Error> {
+pub fn execute_command(working_dir: &Path, args: &[&str]) -> anyhow::Result<()> {
     let status = Command::new(GIT)
         .current_dir(working_dir)
         .args(args)
@@ -39,10 +38,10 @@ pub fn execute_command(working_dir: &Path, args: &[&str]) -> Result<(), Error> {
     }
 }
 
-fn checkout_master(working_dir: &Path) -> Result<(), Error> {
+fn checkout_master(working_dir: &Path) -> anyhow::Result<()> {
     execute_command(working_dir, &[GIT_CHECKOUT, BRANCH])
 }
 
-fn pull_updates(working_dir: &Path) -> Result<(), Error> {
+fn pull_updates(working_dir: &Path) -> anyhow::Result<()> {
     execute_command(working_dir, &[GIT_PULL])
 }

site/src/git.rs

@@ -7,11 +7,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
-extern crate failure;
+use thiserror::Error;
 
-#[derive(Fail, Debug)]
-#[fail(display = "command failed: {}", command)]
+#[derive(Error, Debug)]
+#[error("command failed: {command}")]
 pub struct CommandFailed {
     command: String,
 }

site/src/lib.rs

@@ -12,8 +12,8 @@ use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 
+use anyhow::Context;
 use chrono::{Duration, Utc};
-use failure::{Error, ResultExt};
 use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
 
@@ -110,13 +110,13 @@ lazy_static::lazy_static! {
 }
 
 impl Persistent {
-    pub fn write(&self) -> Result<(), Error> {
+    pub fn write(&self) -> anyhow::Result<()> {
         if PERSISTENT_PATH.exists() {
             let _ = fs::copy(&*PERSISTENT_PATH, "persistent.json.previous");
         }
         let s = serde_json::to_string(self)?;
         fs::write(&*PERSISTENT_PATH, &s)
-            .with_context(|_| format!("failed to write persistent DB"))?;
+            .with_context(|| format!("failed to write persistent DB"))?;
         Ok(())
     }
 
@@ -189,7 +189,7 @@ impl InputData {
     }
 
     /// Initialize `InputData from the file system.
-    pub fn from_fs(repo_loc: &str) -> Result<InputData, Error> {
+    pub fn from_fs(repo_loc: &str) -> anyhow::Result<InputData> {
         let repo_loc = PathBuf::from(repo_loc);
         let mut skipped = 0;
         let mut artifact_data = BTreeMap::new();
@@ -225,7 +225,7 @@ impl InputData {
             let filename = entry.file_name();
             let filename = filename.to_str().unwrap();
             let file_contents =
-                fs::read(entry.path()).with_context(|_| format!("Failed to read {}", filename))?;
+                fs::read(entry.path()).with_context(|| format!("Failed to read {}", filename))?;
 
             if filename.starts_with("artifact-") {
                 let contents: ArtifactData = match serde_json::from_slice(&file_contents) {
@@ -282,7 +282,7 @@ impl InputData {
         data: BTreeMap<Commit, CommitData>,
         artifact_data: BTreeMap<String, ArtifactData>,
         config: Config,
-    ) -> Result<InputData, Error> {
+    ) -> anyhow::Result<InputData> {
         let data = data.into_iter().map(|(_, v)| v).collect::<Vec<_>>();
         let mut last_date = None;
         let mut stats_list = BTreeSet::new();
@@ -514,7 +514,7 @@ impl InputData {
         })
     }
 
-    pub fn missing_commits(&self) -> Result<Vec<(Commit, MissingReason)>, Error> {
+    pub fn missing_commits(&self) -> anyhow::Result<Vec<(Commit, MissingReason)>> {
         let known_benchmarks = self
             .data
             .iter()

site/src/load.rs

@@ -11,7 +11,6 @@ use std::env;
 
 use crate::load::{CommitData, InputData};
 use collector::Bound;
-use failure::Error;
 
 use chrono::Duration;
 
@@ -96,11 +95,13 @@ pub fn data_range<'a>(
 }
 
 /// Reads the repository path from the arguments passed to main()
-pub fn get_repo_path() -> Result<String, Error> {
+pub fn get_repo_path() -> anyhow::Result<String> {
     if let Some(p) = env::args().nth(1) {
         Ok(p)
     } else {
-        bail!("No argument supplied, needs location of data repo.")
+        return Err(anyhow::anyhow!(
+            "No argument supplied, needs location of data repo."
+        ));
     }
 }