make ChainError Send + Sync

This commit is contained in:
Harald Hoyer 2019-03-12 16:43:53 +01:00
parent 51af6da378
commit a558c35ba4
Signed by: harald
GPG key ID: 2C4BF680CB5296D0
20 changed files with 84 additions and 85 deletions

View file

@ -48,12 +48,12 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func3() -> Result<(), Box<Error>> { fn func3() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())

View file

@ -8,7 +8,7 @@ a `std::error::Error`.
Not using `String` errors anymore, the `cherr!()` macro seen in the beginning of Not using `String` errors anymore, the `cherr!()` macro seen in the beginning of
the tutorial has to be used again. the tutorial has to be used again.
Only returning `Func1ErrorKind` in `func1()` now let us get rid of `Result<(), Box<Error>>` and we can Only returning `Func1ErrorKind` in `func1()` now let us get rid of `Result<(), Box<Error + Send + Sync>>` and we can
use `ChainResult<(), Func1ErrorKind>`. use `ChainResult<(), Func1ErrorKind>`.
In `main` we can now directly use the methods of `ChainError<T>` without downcasting the error first. In `main` we can now directly use the methods of `ChainError<T>` without downcasting the error first.

View file

@ -24,7 +24,7 @@ along with the filename (`file!()`) and line number (`line!()`)
and returns `newerror`. and returns `newerror`.
`Err()?` then returns the inner error applying `.into()`, so that we `Err()?` then returns the inner error applying `.into()`, so that we
again have a `Err(Box<Error>)` as a result. again have a `Err(Box<Error + Send + Sync>)` as a result.
The `Debug` implementation of `ChainError<T>` (which is returned by `cherr!()`) The `Debug` implementation of `ChainError<T>` (which is returned by `cherr!()`)
prints the `Debug` of `T` prefixed with the stored filename and line number. prints the `Debug` of `T` prefixed with the stored filename and line number.

View file

@ -7,7 +7,7 @@ In this example `func1()` can return either `Func1ErrorFunc2` or `Func1ErrorIO`.
We might want to `match` on `func1()` with something like: We might want to `match` on `func1()` with something like:
~~~rust,ignore ~~~rust,ignore
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
match func1() { match func1() {
Err(e) if let Some(s) = e.downcast_chain_ref::<Func1ErrorIO>() => Err(e) if let Some(s) = e.downcast_chain_ref::<Func1ErrorIO>() =>
eprintln!("Func1ErrorIO:\n{:?}", s), eprintln!("Func1ErrorIO:\n{:?}", s),

View file

@ -3,12 +3,12 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func3() -> Result<(), Box<Error>> { fn func3() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())

View file

@ -2,25 +2,25 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
if let Err(_) = do_some_io() { if let Err(_) = do_some_io() {
Err("func2 error")?; Err("func2 error")?;
} }
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
if let Err(_) = func2() { if let Err(_) = func2() {
Err("func1 error")?; Err("func1 error")?;
} }
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
func1() func1()
} }

View file

@ -3,14 +3,14 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())
@ -39,7 +39,7 @@ fn func1() -> ChainResult<(), Func1ErrorKind> {
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
match e.kind() { match e.kind() {
Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"), Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"),

View file

@ -3,14 +3,14 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())
@ -45,7 +45,7 @@ fn func1() -> ChainResult<(), Func1ErrorKind> {
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
match e.kind() { match e.kind() {
Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"), Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"),

View file

@ -3,14 +3,14 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())
@ -54,7 +54,7 @@ fn handle_func1errorkind(e: &Func1ErrorKind) {
} }
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
match *e { match *e {
Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"), Func1ErrorKind::Func2 => eprintln!("Main Error Report: func1 error calling func2"),

View file

@ -2,14 +2,14 @@ pub mod mycrate {
use chainerror::*; use chainerror::*;
use std::io; use std::io;
fn do_some_io() -> std::result::Result<(), Box<std::error::Error>> { fn do_some_io() -> std::result::Result<(), Box<std::error::Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> std::result::Result<(), Box<std::error::Error>> { fn func2() -> std::result::Result<(), Box<std::error::Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())

View file

@ -4,25 +4,25 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = do_some_io() { if let Err(e) = do_some_io() {
Err(cherr!(e, "func2 error"))?; Err(cherr!(e, "func2 error"))?;
} }
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func2() { if let Err(e) = func2() {
Err(cherr!(e, "func1 error"))?; Err(cherr!(e, "func1 error"))?;
} }
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
func1() func1()
} }

View file

@ -4,22 +4,22 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
do_some_io().map_err(|e| cherr!(e, "func2 error"))?; do_some_io().map_err(|e| cherr!(e, "func2 error"))?;
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(|e| cherr!(e, "func1 error"))?; func2().map_err(|e| cherr!(e, "func1 error"))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
eprintln!("{:?}", e); eprintln!("{:?}", e);
} }

View file

@ -3,23 +3,23 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(mstrerr!("func1 error"))?; func2().map_err(mstrerr!("func1 error"))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
eprintln!("{:?}", e); eprintln!("{:?}", e);
} }

View file

@ -3,18 +3,18 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func2() { if let Err(e) = func2() {
if let Some(s) = e.source() { if let Some(s) = e.source() {
eprintln!("func2 failed because of '{}'", s); eprintln!("func2 failed because of '{}'", s);
@ -24,7 +24,7 @@ fn func1() -> Result<(), Box<Error>> {
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
eprintln!("{}", e); eprintln!("{}", e);
} }

View file

@ -3,26 +3,26 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(mstrerr!("func1 error"))?; func2().map_err(mstrerr!("func1 error"))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
eprintln!("Error: {}", e); eprintln!("Error: {}", e);
let mut s = e.as_ref(); let mut s : &(dyn Error) = e.as_ref();
while let Some(c) = s.source() { while let Some(c) = s.source() {
if let Some(ioerror) = c.downcast_ref::<io::Error>() { if let Some(ioerror) = c.downcast_ref::<io::Error>() {
eprintln!("caused by: std::io::Error: {}", ioerror); eprintln!("caused by: std::io::Error: {}", ioerror);

View file

@ -3,23 +3,23 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
Ok(()) Ok(())
} }
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(mstrerr!("func1 error"))?; func2().map_err(mstrerr!("func1 error"))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
eprintln!("Error: {}", e); eprintln!("Error: {}", e);
if let Some(s) = e.downcast_chain_ref::<String>() { if let Some(s) = e.downcast_chain_ref::<String>() {

View file

@ -3,14 +3,14 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())
@ -18,12 +18,12 @@ fn func2() -> Result<(), Box<Error>> {
derive_str_cherr!(Func1Error); derive_str_cherr!(Func1Error);
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(mstrerr!(Func1Error, "func1 error"))?; func2().map_err(mstrerr!(Func1Error, "func1 error"))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
if let Some(f1err) = e.downcast_chain_ref::<Func1Error>() { if let Some(f1err) = e.downcast_chain_ref::<Func1Error>() {
eprintln!("Func1Error: {}", f1err); eprintln!("Func1Error: {}", f1err);

View file

@ -3,14 +3,14 @@ use std::error::Error;
use std::io; use std::io;
use std::result::Result; use std::result::Result;
fn do_some_io() -> Result<(), Box<Error>> { fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
Err(io::Error::from(io::ErrorKind::NotFound))?; Err(io::Error::from(io::ErrorKind::NotFound))?;
Ok(()) Ok(())
} }
derive_str_cherr!(Func2Error); derive_str_cherr!(Func2Error);
fn func2() -> Result<(), Box<Error>> { fn func2() -> Result<(), Box<Error + Send + Sync>> {
let filename = "foo.txt"; let filename = "foo.txt";
do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
Ok(()) Ok(())
@ -19,14 +19,14 @@ fn func2() -> Result<(), Box<Error>> {
derive_str_cherr!(Func1ErrorFunc2); derive_str_cherr!(Func1ErrorFunc2);
derive_str_cherr!(Func1ErrorIO); derive_str_cherr!(Func1ErrorIO);
fn func1() -> Result<(), Box<Error>> { fn func1() -> Result<(), Box<Error + Send + Sync>> {
func2().map_err(mstrerr!(Func1ErrorFunc2, "func1 error calling func2"))?; func2().map_err(mstrerr!(Func1ErrorFunc2, "func1 error calling func2"))?;
let filename = "bar.txt"; let filename = "bar.txt";
do_some_io().map_err(mstrerr!(Func1ErrorIO, "Error reading '{}'", filename))?; do_some_io().map_err(mstrerr!(Func1ErrorIO, "Error reading '{}'", filename))?;
Ok(()) Ok(())
} }
fn main() -> Result<(), Box<Error>> { fn main() -> Result<(), Box<Error + Send + Sync>> {
if let Err(e) = func1() { if let Err(e) = func1() {
if let Some(s) = e.downcast_ref::<ChainError<Func1ErrorIO>>() { if let Some(s) = e.downcast_ref::<ChainError<Func1ErrorIO>>() {
eprintln!("Func1ErrorIO:\n{:?}", s); eprintln!("Func1ErrorIO:\n{:?}", s);

View file

@ -32,18 +32,18 @@
//! use std::io; //! use std::io;
//! use std::result::Result; //! use std::result::Result;
//! //!
//! fn do_some_io() -> Result<(), Box<Error>> { //! fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
//! Err(io::Error::from(io::ErrorKind::NotFound))?; //! Err(io::Error::from(io::ErrorKind::NotFound))?;
//! Ok(()) //! Ok(())
//! } //! }
//! //!
//! fn func2() -> Result<(), Box<Error>> { //! fn func2() -> Result<(), Box<Error + Send + Sync>> {
//! let filename = "foo.txt"; //! let filename = "foo.txt";
//! do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; //! do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
//! Ok(()) //! Ok(())
//! } //! }
//! //!
//! fn func1() -> Result<(), Box<Error>> { //! fn func1() -> Result<(), Box<Error + Send + Sync>> {
//! func2().map_err(mstrerr!("func1 error"))?; //! func2().map_err(mstrerr!("func1 error"))?;
//! Ok(()) //! Ok(())
//! } //! }
@ -74,12 +74,12 @@
//! use std::io; //! use std::io;
//! use std::result::Result; //! use std::result::Result;
//! //!
//! fn do_some_io() -> Result<(), Box<Error>> { //! fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
//! Err(io::Error::from(io::ErrorKind::NotFound))?; //! Err(io::Error::from(io::ErrorKind::NotFound))?;
//! Ok(()) //! Ok(())
//! } //! }
//! //!
//! fn func3() -> Result<(), Box<Error>> { //! fn func3() -> Result<(), Box<Error + Send + Sync>> {
//! let filename = "foo.txt"; //! let filename = "foo.txt";
//! do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; //! do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
//! Ok(()) //! Ok(())
@ -175,7 +175,6 @@
macro_use_extern_crate, macro_use_extern_crate,
missing_debug_implementations, missing_debug_implementations,
missing_docs, missing_docs,
trivial_casts,
trivial_numeric_casts, trivial_numeric_casts,
unused_extern_crates, unused_extern_crates,
unused_import_braces, unused_import_braces,
@ -201,7 +200,7 @@ pub struct ChainError<T> {
#[cfg(not(feature = "no-fileline"))] #[cfg(not(feature = "no-fileline"))]
occurrence: Option<&'static str>, occurrence: Option<&'static str>,
kind: T, kind: T,
error_cause: Option<Box<dyn Error + 'static>>, error_cause: Option<Box<dyn Error + 'static + Send + Sync>>,
} }
/// convenience type alias /// convenience type alias
@ -213,7 +212,7 @@ impl<T: 'static + Display + Debug> ChainError<T> {
#[inline] #[inline]
pub fn new( pub fn new(
kind: T, kind: T,
error_cause: Option<Box<dyn Error + 'static>>, error_cause: Option<Box<dyn Error + 'static + Send + Sync>>,
occurrence: Option<&'static str>, occurrence: Option<&'static str>,
) -> Self { ) -> Self {
Self { Self {
@ -228,7 +227,7 @@ impl<T: 'static + Display + Debug> ChainError<T> {
#[inline] #[inline]
pub fn new( pub fn new(
kind: T, kind: T,
error_cause: Option<Box<dyn Error + 'static>>, error_cause: Option<Box<dyn Error + 'static + Send + Sync>>,
_occurrence: Option<&'static str>, _occurrence: Option<&'static str>,
) -> Self { ) -> Self {
Self { kind, error_cause } Self { kind, error_cause }
@ -248,14 +247,14 @@ impl<T: 'static + Display + Debug> ChainError<T> {
/// # use std::error::Error; /// # use std::error::Error;
/// # use std::io; /// # use std::io;
/// # use std::result::Result; /// # use std::result::Result;
/// fn do_some_io() -> Result<(), Box<Error>> { /// fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
/// Err(io::Error::from(io::ErrorKind::NotFound))?; /// Err(io::Error::from(io::ErrorKind::NotFound))?;
/// Ok(()) /// Ok(())
/// } /// }
/// ///
/// derive_str_cherr!(Func2Error); /// derive_str_cherr!(Func2Error);
/// ///
/// fn func2() -> Result<(), Box<Error>> { /// fn func2() -> Result<(), Box<Error + Send + Sync>> {
/// let filename = "foo.txt"; /// let filename = "foo.txt";
/// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; /// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
/// Ok(()) /// Ok(())
@ -263,7 +262,7 @@ impl<T: 'static + Display + Debug> ChainError<T> {
/// ///
/// derive_str_cherr!(Func1Error); /// derive_str_cherr!(Func1Error);
/// ///
/// fn func1() -> Result<(), Box<Error>> { /// fn func1() -> Result<(), Box<Error + Send + Sync>> {
/// func2().map_err(mstrerr!(Func1Error, "func1 error"))?; /// func2().map_err(mstrerr!(Func1Error, "func1 error"))?;
/// Ok(()) /// Ok(())
/// } /// }
@ -353,14 +352,14 @@ impl<T: 'static + Display + Debug> ChainError<T> {
/// # use std::error::Error; /// # use std::error::Error;
/// # use std::io; /// # use std::io;
/// # use std::result::Result; /// # use std::result::Result;
/// fn do_some_io() -> Result<(), Box<Error>> { /// fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
/// Err(io::Error::from(io::ErrorKind::NotFound))?; /// Err(io::Error::from(io::ErrorKind::NotFound))?;
/// Ok(()) /// Ok(())
/// } /// }
/// ///
/// derive_str_cherr!(Func2Error); /// derive_str_cherr!(Func2Error);
/// ///
/// fn func2() -> Result<(), Box<Error>> { /// fn func2() -> Result<(), Box<Error + Send + Sync>> {
/// let filename = "foo.txt"; /// let filename = "foo.txt";
/// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; /// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
/// Ok(()) /// Ok(())
@ -539,21 +538,21 @@ impl ChainErrorDown for dyn Error + 'static + Send + Sync {
impl<T: 'static + Display + Debug> Error for ChainError<T> { impl<T: 'static + Display + Debug> Error for ChainError<T> {
#[inline] #[inline]
fn source(&self) -> Option<&(dyn Error + 'static)> { fn source(&self) -> Option<&(dyn Error + 'static)> {
self.error_cause.as_ref().map(|e| e.as_ref()) self.error_cause.as_ref().map(|e| e.as_ref() as &(dyn Error + 'static))
} }
} }
impl<T: 'static + Display + Debug> Error for &ChainError<T> { impl<T: 'static + Display + Debug> Error for &ChainError<T> {
#[inline] #[inline]
fn source(&self) -> Option<&(dyn Error + 'static)> { fn source(&self) -> Option<&(dyn Error + 'static)> {
self.error_cause.as_ref().map(|e| e.as_ref()) self.error_cause.as_ref().map(|e| e.as_ref() as &(dyn Error + 'static))
} }
} }
impl<T: 'static + Display + Debug> Error for &mut ChainError<T> { impl<T: 'static + Display + Debug> Error for &mut ChainError<T> {
#[inline] #[inline]
fn source(&self) -> Option<&(dyn Error + 'static)> { fn source(&self) -> Option<&(dyn Error + 'static)> {
self.error_cause.as_ref().map(|e| e.as_ref()) self.error_cause.as_ref().map(|e| e.as_ref() as &(dyn Error + 'static))
} }
} }
@ -714,7 +713,7 @@ macro_rules! into_cherr {
/// # } /// # }
/// # } /// # }
/// # } /// # }
/// fn do_some_stuff() -> Result<(), Box<Error>> { /// fn do_some_stuff() -> Result<(), Box<Error + Send + Sync>> {
/// Err(io::Error::from(io::ErrorKind::NotFound))?; /// Err(io::Error::from(io::ErrorKind::NotFound))?;
/// Ok(()) /// Ok(())
/// } /// }
@ -772,17 +771,17 @@ macro_rules! mcherr {
/// # use std::error::Error; /// # use std::error::Error;
/// # use std::io; /// # use std::io;
/// # use std::result::Result; /// # use std::result::Result;
/// # fn do_some_io() -> Result<(), Box<Error>> { /// # fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
/// # Err(io::Error::from(io::ErrorKind::NotFound))?; /// # Err(io::Error::from(io::ErrorKind::NotFound))?;
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// fn func2() -> Result<(), Box<Error>> { /// fn func2() -> Result<(), Box<Error + Send + Sync>> {
/// let filename = "foo.txt"; /// let filename = "foo.txt";
/// do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?; /// do_some_io().map_err(mstrerr!("Error reading '{}'", filename))?;
/// Ok(()) /// Ok(())
/// } /// }
/// ///
/// fn func1() -> Result<(), Box<Error>> { /// fn func1() -> Result<(), Box<Error + Send + Sync>> {
/// func2().map_err(mstrerr!("func1 error"))?; /// func2().map_err(mstrerr!("func1 error"))?;
/// Ok(()) /// Ok(())
/// } /// }
@ -813,13 +812,13 @@ macro_rules! mcherr {
/// # use std::error::Error; /// # use std::error::Error;
/// # use std::io; /// # use std::io;
/// # use std::result::Result; /// # use std::result::Result;
/// # fn do_some_io() -> Result<(), Box<Error>> { /// # fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
/// # Err(io::Error::from(io::ErrorKind::NotFound))?; /// # Err(io::Error::from(io::ErrorKind::NotFound))?;
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// derive_str_cherr!(Func2Error); /// derive_str_cherr!(Func2Error);
/// ///
/// fn func2() -> Result<(), Box<Error>> { /// fn func2() -> Result<(), Box<Error + Send + Sync>> {
/// let filename = "foo.txt"; /// let filename = "foo.txt";
/// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?; /// do_some_io().map_err(mstrerr!(Func2Error, "Error reading '{}'", filename))?;
/// Ok(()) /// Ok(())
@ -827,7 +826,7 @@ macro_rules! mcherr {
/// ///
/// derive_str_cherr!(Func1Error); /// derive_str_cherr!(Func1Error);
/// ///
/// fn func1() -> Result<(), Box<Error>> { /// fn func1() -> Result<(), Box<Error + Send + Sync>> {
/// func2().map_err(mstrerr!(Func1Error, "func1 error"))?; /// func2().map_err(mstrerr!(Func1Error, "func1 error"))?;
/// Ok(()) /// Ok(())
/// } /// }
@ -883,7 +882,7 @@ macro_rules! mstrerr {
/// ///
/// derive_str_cherr!(Func1Error); /// derive_str_cherr!(Func1Error);
/// ///
/// fn func1() -> Result<(), Box<Error>> { /// fn func1() -> Result<(), Box<Error + Send + Sync>> {
/// func2().map_err(mstrerr!(Func1Error, "func1 error"))?; /// func2().map_err(mstrerr!(Func1Error, "func1 error"))?;
/// Ok(()) /// Ok(())
/// } /// }
@ -931,7 +930,7 @@ macro_rules! strerr {
/// # use std::error::Error; /// # use std::error::Error;
/// # use std::io; /// # use std::io;
/// # use std::result::Result; /// # use std::result::Result;
/// # fn do_some_io() -> Result<(), Box<Error>> { /// # fn do_some_io() -> Result<(), Box<Error + Send + Sync>> {
/// # Err(io::Error::from(io::ErrorKind::NotFound))?; /// # Err(io::Error::from(io::ErrorKind::NotFound))?;
/// # Ok(()) /// # Ok(())
/// # } /// # }
@ -945,7 +944,7 @@ macro_rules! strerr {
/// ///
/// derive_str_cherr!(Func1Error); /// derive_str_cherr!(Func1Error);
/// ///
/// fn func1() -> Result<(), Box<Error>> { /// fn func1() -> Result<(), Box<Error + Send + Sync>> {
/// func2().map_err(mstrerr!(Func1Error, "func1 error"))?; /// func2().map_err(mstrerr!(Func1Error, "func1 error"))?;
/// Ok(()) /// Ok(())
/// } /// }

View file

@ -4,7 +4,7 @@ use std::fmt::Write;
use std::io; use std::io;
#[test] #[test]
fn test_iter() -> Result<(), Box<Error>> { fn test_iter() -> Result<(), Box<Error + Send + Sync>> {
let err = io::Error::from(io::ErrorKind::NotFound); let err = io::Error::from(io::ErrorKind::NotFound);
let err = cherr!(err, "1"); let err = cherr!(err, "1");
let err = cherr!(err, "2"); let err = cherr!(err, "2");
@ -31,7 +31,7 @@ fn test_iter() -> Result<(), Box<Error>> {
} }
#[test] #[test]
fn test_find_cause() -> Result<(), Box<Error>> { fn test_find_cause() -> Result<(), Box<Error + Send + Sync>> {
let err = io::Error::from(io::ErrorKind::NotFound); let err = io::Error::from(io::ErrorKind::NotFound);
let err = cherr!(err, "1"); let err = cherr!(err, "1");
let err = cherr!(err, "2"); let err = cherr!(err, "2");
@ -48,7 +48,7 @@ fn test_find_cause() -> Result<(), Box<Error>> {
} }
#[test] #[test]
fn test_root_cause() -> Result<(), Box<Error>> { fn test_root_cause() -> Result<(), Box<Error + Send + Sync>> {
let err = io::Error::from(io::ErrorKind::NotFound); let err = io::Error::from(io::ErrorKind::NotFound);
let err = cherr!(err, "1"); let err = cherr!(err, "1");
let err = cherr!(err, "2"); let err = cherr!(err, "2");