Replace failure crate with anyhow+thiserror

Failure was [deprecated][0] and suggests anyhow+thiserror to replace
itself in dependent projects.

[0]: rust-lang-deprecated/failure#347

Author: steveej

Cargo.lock

@@ -10,7 +10,6 @@ commons = { path = "../commons" }
 custom_debug_derive = "^0.1.7"
 daggy = { version = "^0.6.0", features = [ "serde-1" ] }
 env_logger = "^0.6.0"
-failure = "^0.1.1"
 futures = "0.3"
 futures-locks = "0.5.0"
 lazy_static = "^1.2.0"

cincinnati/Cargo.toml

@@ -12,18 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[macro_use]
-extern crate failure;
-
 #[macro_use]
 extern crate serde_derive;
 
 #[macro_use]
 pub mod plugins;
 
+use commons::prelude_errors::*;
 use daggy::petgraph::visit::{IntoNodeReferences, NodeRef};
 use daggy::{Dag, EdgeIndex, Walker};
-use failure::{Error, Fallible};
 use serde::de::{self, Deserialize, Deserializer, MapAccess, Visitor};
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 use std::{collections, fmt};
@@ -154,25 +151,27 @@ pub struct Empty;
 
 /// Errors that can be returned by the methods in this library
 pub mod errors {
+    use commons::prelude_errors::*;
+
     /// Edge already exists
     #[derive(Debug, Fail, Eq, PartialEq)]
-    #[fail(display = "edge from {:?} to {:?} already exists", from, to)]
+    #[error("edge from {:?} to {:?} already exists", from, to)]
     pub struct EdgeAlreadyExists {
         pub(crate) from: String,
         pub(crate) to: String,
     }
 
     /// Edge doesn't exist
     #[derive(Debug, Fail, Eq, PartialEq)]
-    #[fail(display = "edge from '{:?}' to '{:?}' doesn't exist", from, to)]
+    #[error("edge from '{:?}' to '{:?}' doesn't exist", from, to)]
     pub struct EdgeDoesntExist {
         pub(crate) from: String,
         pub(crate) to: String,
     }
 
     /// Missing node weight
     #[derive(Debug, Fail, Eq, PartialEq)]
-    #[fail(display = "NodeWeight with index {} is missing", 0)]
+    #[error("NodeWeight with index {} is missing", 0)]
     pub struct NodeWeightMissing(pub(crate) usize);
 }
 

cincinnati/src/lib.rs

@@ -22,7 +22,7 @@ use super::internal::openshift_secondary_metadata_parser::{
 use super::internal::release_scrape_dockerv2::{
     ReleaseScrapeDockerv2Plugin, ReleaseScrapeDockerv2Settings,
 };
-use failure::{bail, format_err, Fallible};
+use commons::prelude_errors::*;
 use std::fmt::Debug;
 
 /// Key used to look up plugin-type in a configuration entry.

cincinnati/src/plugins/catalog.rs

@@ -20,8 +20,8 @@ mod tests {
     use async_trait::async_trait;
     use cincinnati::plugins::{interface, ExternalIO, ExternalPlugin, InternalIO, PluginResult};
     use cincinnati::testing::generate_graph;
+    use commons::prelude_errors::*;
     use commons::testing::init_runtime;
-    use failure::Fallible;
     use log::trace;
     use std::convert::TryInto;
 

cincinnati/src/plugins/external/web.rs

@@ -9,8 +9,8 @@ use self::cincinnati::plugins::prelude::*;
 use self::cincinnati::plugins::prelude_plugin_impl::*;
 use self::cincinnati::CONTENT_TYPE;
 
+use commons::prelude_errors::*;
 use commons::GraphError;
-use failure::{Fallible, ResultExt};
 use prometheus::Counter;
 use reqwest;
 use reqwest::header::{HeaderValue, ACCEPT};
@@ -158,8 +158,8 @@ mod tests {
     use super::*;
     use cincinnati::testing::generate_custom_graph;
     use commons::metrics::{self, RegistryWrapper};
+    use commons::prelude_errors::*;
     use commons::testing::{self, init_runtime};
-    use failure::{bail, Fallible};
     use prometheus::Registry;
 
     macro_rules! fetch_upstream_success_test {
@@ -318,7 +318,7 @@ mod tests {
         let metrics_call = metrics::serve::<metrics::RegistryWrapper>(actix_web::web::Data::new(
             RegistryWrapper(registry),
         ));
-        let resp = rt.block_on(metrics_call)?;
+        let resp = rt.block_on(metrics_call);
 
         assert_eq!(resp.status(), 200);
         if let actix_web::body::ResponseBody::Body(body) = resp.body() {

cincinnati/src/plugins/internal/cincinnati_graph_fetch.rs

@@ -333,7 +333,6 @@ mod tests {
     use cincinnati::testing::generate_custom_graph;
     use cincinnati::MapImpl;
     use commons::testing::init_runtime;
-    use failure::ResultExt;
 
     static KEY_PREFIX: &str = "test_key";