Auto merge of #679 - Mark-Simulacrum:bump-deps, r=Mark-Simulacrum

Replace Fail derive with thiserror::Error

Author: bors

src/actions/experiments/mod.rs

@@ -6,15 +6,15 @@ pub use self::create::CreateExperiment;
 pub use self::delete::DeleteExperiment;
 pub use self::edit::EditExperiment;
 
-#[derive(Debug, failure::Fail)]
+#[derive(Debug, thiserror::Error)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub enum ExperimentError {
-    #[fail(display = "experiment '{}' not found", _0)]
+    #[error("experiment '{0}' not found")]
     NotFound(String),
-    #[fail(display = "experiment '{}' already exists", _0)]
+    #[error("experiment '{0}' already exists")]
     AlreadyExists(String),
-    #[fail(display = "duplicate toolchains provided")]
+    #[error("duplicate toolchains provided")]
     DuplicateToolchains,
-    #[fail(display = "it's only possible to edit queued experiments")]
+    #[error("it's only possible to edit queued experiments")]
     CanOnlyEditQueuedExperiments,
 }

src/agent/api.rs

@@ -15,17 +15,17 @@ use reqwest::{Method, StatusCode};
 use serde::de::DeserializeOwned;
 use serde_json::json;
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 pub enum AgentApiError {
-    #[fail(display = "invalid API endpoint called")]
+    #[error("invalid API endpoint called")]
     InvalidEndpoint,
-    #[fail(display = "Crater server unavailable")]
+    #[error("Crater server unavailable")]
     ServerUnavailable,
-    #[fail(display = "payload sent to the server too large")]
+    #[error("payload sent to the server too large")]
     PayloadTooLarge,
-    #[fail(display = "invalid authorization token")]
+    #[error("invalid authorization token")]
     InvalidAuthorizationToken,
-    #[fail(display = "internal server error: {}", _0)]
+    #[error("internal server error: {0}")]
     InternalServerError(String),
 }
 

src/config.rs

@@ -17,8 +17,8 @@ fn default_config_file() -> PathBuf {
         .into()
 }
 
-#[derive(Debug, Fail)]
-#[fail(display = "the configuration file has errors")]
+#[derive(Debug, thiserror::Error)]
+#[error("the configuration file has errors")]
 pub struct BadConfig;
 
 #[derive(Clone, Serialize, Deserialize)]

src/report/s3.rs

@@ -9,9 +9,9 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use url::{Host, Url};
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 pub enum S3Error {
-    #[fail(display = "bad S3 url: {}", _0)]
+    #[error("bad S3 url: {0}")]
     BadUrl(String),
 }
 

src/results/mod.rs

@@ -156,11 +156,11 @@ macro_rules! test_result_enum {
     }
 }
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 pub enum TestResultParseError {
-    #[fail(display = "unknown test result: {}", _0)]
+    #[error("unknown test result: {0}")]
     UnknownResult(String),
-    #[fail(display = "unexpected failure reason")]
+    #[error("unexpected failure reason")]
     UnexpectedFailureReason,
 }
 

src/runner/mod.rs

@@ -19,8 +19,8 @@ use std::time::Duration;
 const DISK_SPACE_WATCHER_INTERVAL: Duration = Duration::from_secs(30);
 const DISK_SPACE_WATCHER_THRESHOLD: f32 = 0.80;
 
-#[derive(Debug, Fail)]
-#[fail(display = "overridden task result to {}", _0)]
+#[derive(Debug, thiserror::Error)]
+#[error("overridden task result to {0}")]
 pub struct OverrideResult(TestResult);
 
 struct RunnerStateInner {

src/server/github.rs

@@ -7,9 +7,9 @@ use reqwest::{Method, StatusCode};
 use serde_json::json;
 use std::collections::HashMap;
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 pub enum GitHubError {
-    #[fail(display = "request to GitHub API failed with status {}: {}", _0, _1)]
+    #[error("request to GitHub API failed with status {0}: {1}")]
     RequestFailed(StatusCode, String),
 }
 

src/server/mod.rs

@@ -29,11 +29,11 @@ lazy_static! {
         format!("crater/{}", crate::GIT_REVISION.unwrap_or("unknown"));
 }
 
-#[derive(Debug, Fail, PartialEq, Eq, Copy, Clone)]
+#[derive(Debug, thiserror::Error, PartialEq, Eq, Copy, Clone)]
 pub enum HttpError {
-    #[fail(display = "not found")]
+    #[error("not found")]
     NotFound,
-    #[fail(display = "forbidden")]
+    #[error("forbidden")]
     Forbidden,
 }
 

src/server/routes/webhooks/args.rs

@@ -2,16 +2,16 @@ use crate::experiments::{Assignee, CapLints, DeferredCrateSelect, Mode};
 use crate::toolchain::Toolchain;
 use failure::{self, Fallible};
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub enum CommandParseError {
-    #[fail(display = "missing command")]
+    #[error("missing command")]
     MissingCommand,
-    #[fail(display = "invalid argument: {}", _0)]
+    #[error("invalid argument: {0}")]
     InvalidArgument(String),
-    #[fail(display = "duplicate key: {}", _0)]
+    #[error("duplicate key: {0}")]
     DuplicateKey(String),
-    #[fail(display = "unknown key: {}", _0)]
+    #[error("unknown key: {0}")]
     UnknownKey(String),
 }
 

src/utils/hex.rs

@@ -1,11 +1,11 @@
 use crate::prelude::*;
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub(crate) enum HexError {
-    #[fail(display = "invalid char in hex: {}", _0)]
+    #[error("invalid char in hex: {0}")]
     InvalidChar(char),
-    #[fail(display = "invalid hex length")]
+    #[error("invalid hex length")]
     InvalidLength,
 }