migrate from failure to anyhow + thiserror (#127)

Author: drunkirishcoder

bench/Cargo.toml

@@ -10,9 +10,9 @@ Benchmarks for Capsule.
 """
 
 [dev-dependencies]
+anyhow = "1.0"
 capsule = { version = "0.1", path = "../core", features = ["testils"] }
 criterion = "0.3"
-failure = "0.1"
 proptest = "0.10"
 
 [[bench]]

bench/combinators.rs

@@ -16,14 +16,14 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+use anyhow::Result;
 use capsule::batch::{Batch, Either};
 use capsule::packets::ip::v4::Ipv4;
 use capsule::packets::{Ethernet, Packet};
 use capsule::testils::criterion::BencherExt;
 use capsule::testils::proptest::*;
 use capsule::{compose, Mbuf};
 use criterion::{criterion_group, criterion_main, Criterion};
-use failure::Fallible;
 use proptest::prelude::*;
 use proptest::strategy;
 
@@ -86,7 +86,7 @@ fn map(batch: impl Batch<Item = Mbuf>) -> impl Batch<Item = Ethernet> {
     batch.map(|p| p.parse::<Ethernet>())
 }
 
-fn no_batch_map(mbuf: Mbuf) -> Fallible<Ethernet> {
+fn no_batch_map(mbuf: Mbuf) -> Result<Ethernet> {
     mbuf.parse::<Ethernet>()
 }
 
@@ -189,7 +189,7 @@ fn replace(batch: impl Batch<Item = Mbuf>) -> impl Batch<Item = Mbuf> {
     batch.replace(|_p| Mbuf::new())
 }
 
-fn no_batch_replace(_mbuf: Mbuf) -> Fallible<Mbuf> {
+fn no_batch_replace(_mbuf: Mbuf) -> Result<Mbuf> {
     Mbuf::new()
 }
 

bench/mbuf.rs

@@ -16,19 +16,19 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+use anyhow::Result;
 use capsule::Mbuf;
 use criterion::{criterion_group, criterion_main, Criterion};
-use failure::Fallible;
 
 const BATCH_SIZE: usize = 100;
 
-fn alloc() -> Fallible<Vec<Mbuf>> {
+fn alloc() -> Result<Vec<Mbuf>> {
     (0..BATCH_SIZE)
         .map(|_| Mbuf::new())
-        .collect::<Fallible<Vec<Mbuf>>>()
+        .collect::<Result<Vec<Mbuf>>>()
 }
 
-fn alloc_bulk() -> Fallible<Vec<Mbuf>> {
+fn alloc_bulk() -> Result<Vec<Mbuf>> {
     Mbuf::alloc_bulk(BATCH_SIZE)
 }
 

bench/packets.rs

@@ -16,6 +16,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+use anyhow::Result;
 use capsule::packets::ip::v4::Ipv4;
 use capsule::packets::ip::v6::{Ipv6, SegmentRouting};
 use capsule::packets::{Ethernet, Packet, Udp4};
@@ -24,7 +25,6 @@ use capsule::testils::proptest::*;
 use capsule::testils::{PacketExt, Rvg};
 use capsule::{fieldmap, Mbuf};
 use criterion::{criterion_group, criterion_main, Criterion};
-use failure::Fallible;
 use proptest::prelude::*;
 use std::net::Ipv6Addr;
 
@@ -228,7 +228,7 @@ fn multi_remove(c: &mut Criterion) {
     });
 }
 
-fn set_srh_segments(mut args: (SegmentRouting<Ipv6>, Vec<Ipv6Addr>)) -> Fallible<()> {
+fn set_srh_segments(mut args: (SegmentRouting<Ipv6>, Vec<Ipv6Addr>)) -> Result<()> {
     args.0.set_segments(&args.1)
 }
 

core/Cargo.toml

@@ -20,11 +20,11 @@ path = "src/lib.rs"
 doctest = false
 
 [dependencies]
+anyhow = "1.0"
 capsule-ffi = { version = "0.1.4", path = "../ffi" }
 capsule-macros = { version = "0.1.4", path = "../macros" }
 clap = "2.33"
 criterion = { version = "0.3", optional = true }
-failure = "0.1"
 futures-preview = "=0.3.0-alpha.19"
 libc = "0.2"
 metrics-core = { version = "0.5", optional = true }
@@ -33,6 +33,7 @@ once_cell = "1.2"
 proptest = { version = "0.10", optional = true }
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }
+thiserror = "1.0"
 tokio = "=0.2.0-alpha.6"
 tokio-executor = { version = "=0.2.0-alpha.6", features = ["current-thread", "threadpool"] }
 tokio-net = { version = "=0.2.0-alpha.6", features = ["signal"] }

core/src/batch/filter_map.rs

@@ -19,7 +19,7 @@
 use super::{Batch, Disposition};
 use crate::packets::Packet;
 use crate::Mbuf;
-use failure::Fallible;
+use anyhow::Result;
 
 /// The result of a [`filter_map`].
 ///
@@ -41,15 +41,15 @@ pub enum Either<T> {
 #[allow(missing_debug_implementations)]
 pub struct FilterMap<B: Batch, T: Packet, F>
 where
-    F: FnMut(B::Item) -> Fallible<Either<T>>,
+    F: FnMut(B::Item) -> Result<Either<T>>,
 {
     batch: B,
     f: F,
 }
 
 impl<B: Batch, T: Packet, F> FilterMap<B, T, F>
 where
-    F: FnMut(B::Item) -> Fallible<Either<T>>,
+    F: FnMut(B::Item) -> Result<Either<T>>,
 {
     /// Creates a new `FilterMap` batch.
     #[inline]
@@ -60,7 +60,7 @@ where
 
 impl<B: Batch, T: Packet, F> Batch for FilterMap<B, T, F>
 where
-    F: FnMut(B::Item) -> Fallible<Either<T>>,
+    F: FnMut(B::Item) -> Result<Either<T>>,
 {
     type Item = T;
 

core/src/batch/for_each.rs

@@ -17,21 +17,21 @@
 */
 
 use super::{Batch, Disposition};
-use failure::Fallible;
+use anyhow::Result;
 
 /// A batch that calls a closure on packets in the underlying batch.
 #[allow(missing_debug_implementations)]
 pub struct ForEach<B: Batch, F>
 where
-    F: FnMut(&B::Item) -> Fallible<()>,
+    F: FnMut(&B::Item) -> Result<()>,
 {
     batch: B,
     f: F,
 }
 
 impl<B: Batch, F> ForEach<B, F>
 where
-    F: FnMut(&B::Item) -> Fallible<()>,
+    F: FnMut(&B::Item) -> Result<()>,
 {
     /// Creates a new `ForEach` batch.
     #[inline]
@@ -42,7 +42,7 @@ where
 
 impl<B: Batch, F> Batch for ForEach<B, F>
 where
-    F: FnMut(&B::Item) -> Fallible<()>,
+    F: FnMut(&B::Item) -> Result<()>,
 {
     type Item = B::Item;
 

core/src/batch/map.rs

@@ -18,7 +18,7 @@
 
 use super::{Batch, Disposition};
 use crate::packets::Packet;
-use failure::Fallible;
+use anyhow::Result;
 
 /// A batch that maps the packets of the underlying batch.
 ///
@@ -27,15 +27,15 @@ use failure::Fallible;
 #[allow(missing_debug_implementations)]
 pub struct Map<B: Batch, T: Packet, F>
 where
-    F: FnMut(B::Item) -> Fallible<T>,
+    F: FnMut(B::Item) -> Result<T>,
 {
     batch: B,
     f: F,
 }
 
 impl<B: Batch, T: Packet, F> Map<B, T, F>
 where
-    F: FnMut(B::Item) -> Fallible<T>,
+    F: FnMut(B::Item) -> Result<T>,
 {
     /// Creates a new `Map` batch.
     #[inline]
@@ -46,7 +46,7 @@ where
 
 impl<B: Batch, T: Packet, F> Batch for Map<B, T, F>
 where
-    F: FnMut(B::Item) -> Fallible<T>,
+    F: FnMut(B::Item) -> Result<T>,
 {
     type Item = T;
 

core/src/batch/mod.rs

@@ -44,7 +44,7 @@ pub use self::send::*;
 
 use crate::packets::Packet;
 use crate::Mbuf;
-use failure::{Error, Fallible};
+use anyhow::{Error, Result};
 use std::collections::HashMap;
 use std::hash::Hash;
 
@@ -198,7 +198,7 @@ pub trait Batch {
     #[inline]
     fn filter_map<T: Packet, F>(self, f: F) -> FilterMap<Self, T, F>
     where
-        F: FnMut(Self::Item) -> Fallible<Either<T>>,
+        F: FnMut(Self::Item) -> Result<Either<T>>,
         Self: Sized,
     {
         FilterMap::new(self, f)
@@ -216,7 +216,7 @@ pub trait Batch {
     #[inline]
     fn map<T: Packet, F>(self, f: F) -> Map<Self, T, F>
     where
-        F: FnMut(Self::Item) -> Fallible<T>,
+        F: FnMut(Self::Item) -> Result<T>,
         Self: Sized,
     {
         Map::new(self, f)
@@ -238,7 +238,7 @@ pub trait Batch {
     #[inline]
     fn for_each<F>(self, f: F) -> ForEach<Self, F>
     where
-        F: FnMut(&Self::Item) -> Fallible<()>,
+        F: FnMut(&Self::Item) -> Result<()>,
         Self: Sized,
     {
         ForEach::new(self, f)
@@ -343,7 +343,7 @@ pub trait Batch {
     /// });
     fn replace<T: Packet, F>(self, f: F) -> Replace<Self, T, F>
     where
-        F: FnMut(&Self::Item) -> Fallible<T>,
+        F: FnMut(&Self::Item) -> Result<T>,
         Self: Sized,
     {
         Replace::new(self, f)

core/src/batch/replace.rs

@@ -18,7 +18,7 @@
 
 use super::{Batch, Disposition};
 use crate::packets::Packet;
-use failure::Fallible;
+use anyhow::Result;
 
 /// A batch that replaces each packet of the batch with another packet.
 ///
@@ -28,7 +28,7 @@ use failure::Fallible;
 #[allow(missing_debug_implementations)]
 pub struct Replace<B: Batch, T: Packet, F>
 where
-    F: FnMut(&B::Item) -> Fallible<T>,
+    F: FnMut(&B::Item) -> Result<T>,
 {
     batch: B,
     f: F,
@@ -37,7 +37,7 @@ where
 
 impl<B: Batch, T: Packet, F> Replace<B, T, F>
 where
-    F: FnMut(&B::Item) -> Fallible<T>,
+    F: FnMut(&B::Item) -> Result<T>,
 {
     /// Creates a new `Replace` batch.
     #[inline]
@@ -52,7 +52,7 @@ where
 
 impl<B: Batch, T: Packet, F> Batch for Replace<B, T, F>
 where
-    F: FnMut(&B::Item) -> Fallible<T>,
+    F: FnMut(&B::Item) -> Result<T>,
 {
     type Item = T;