Merge PR rust-lang-deprecated#241.

Pernosco · Mar 13, 2019 · 6e60b8a · 6e60b8a
2 parents 38f2324 + c9260c7
commit 6e60b8a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/error_chain.rs b/src/error_chain.rs
@@ -87,7 +87,7 @@ macro_rules! impl_error_chain_processed {
 
             fn with_chain<E, K>(error: E, kind: K)
                 -> Self
-                where E: ::std::error::Error + Send + 'static,
+                where E: ::std::error::Error + Send + Sync + 'static,
                       K: Into<Self::ErrorKind>
             {
                 Self::with_chain(error, kind)
@@ -129,14 +129,14 @@ macro_rules! impl_error_chain_processed {
             /// Constructs a chained error from another error and a kind, and generates a backtrace.
             pub fn with_chain<E, K>(error: E, kind: K)
                 -> $error_name
-                where E: ::std::error::Error + Send + 'static,
+                where E: ::std::error::Error + Send + Sync + 'static,
                       K: Into<$error_kind_name>
             {
                 $error_name::with_boxed_chain(Box::new(error), kind)
             }
 
             /// Construct a chained error from another boxed error and a kind, and generates a backtrace
-            pub fn with_boxed_chain<K>(error: Box<::std::error::Error + Send>, kind: K)
+            pub fn with_boxed_chain<K>(error: Box<::std::error::Error + Send + Sync>, kind: K)
                 -> $error_name
                 where K: Into<$error_kind_name>
             {
@@ -320,7 +320,7 @@ macro_rules! impl_error_chain_processed {
                       EK: Into<$error_kind_name>;
         }
 
-        impl<T, E> $result_ext_name<T> for ::std::result::Result<T, E> where E: ::std::error::Error + Send + 'static {
+        impl<T, E> $result_ext_name<T> for ::std::result::Result<T, E> where E: ::std::error::Error + Send + Sync + 'static {
             fn chain_err<F, EK>(self, callback: F) -> ::std::result::Result<T, $error_name>
                 where F: FnOnce() -> EK,
                       EK: Into<$error_kind_name> {

diff --git a/src/example_generated.rs b/src/example_generated.rs
@@ -36,3 +36,20 @@ error_chain! {
         Custom
     }
 }
+
+#[cfg(test)]
+mod test {
+
+    use super::Error;
+
+    #[test]
+    fn generated_error_meets_bounds() {
+        fn is_sync<T: Sync>() { }
+        fn is_send<T: Send>() { }
+        fn is_static<T: 'static>() { }
+        is_sync::<Error>();
+        is_send::<Error>();
+        is_static::<Error>();
+        assert!(true);
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -546,7 +546,7 @@ mod error_chain;
 #[macro_use]
 mod quick_main;
 pub use quick_main::ExitCode;
-#[cfg(feature = "example_generated")]
+#[cfg(any(test, feature = "example_generated"))]
 pub mod example_generated;
 mod backtrace;
 pub use backtrace::Backtrace;
@@ -590,7 +590,7 @@ pub trait ChainedError: error::Error + Send + 'static {
     /// Constructs a chained error from another error and a kind, and generates a backtrace.
     fn with_chain<E, K>(error: E, kind: K) -> Self
         where Self: Sized,
-              E: ::std::error::Error + Send + 'static,
+              E: ::std::error::Error + Send + Sync + 'static,
               K: Into<Self::ErrorKind>;
 
     /// Returns the kind of the error.
@@ -654,7 +654,7 @@ impl<'a, T> fmt::Display for DisplayChain<'a, T>
 #[doc(hidden)]
 pub struct State {
     /// Next error in the error chain.
-    pub next_error: Option<Box<error::Error + Send>>,
+    pub next_error: Option<Box<error::Error + Send + Sync>>,
     /// Backtrace for the current error.
     pub backtrace: InternalBacktrace,
 }
@@ -670,7 +670,7 @@ impl Default for State {
 
 impl State {
     /// Creates a new State type
-    pub fn new<CE: ChainedError>(e: Box<error::Error + Send>) -> State {
+    pub fn new<CE: ChainedError>(e: Box<error::Error + Send + Sync>) -> State {
         let backtrace = CE::extract_backtrace(&*e)
             .unwrap_or_else(InternalBacktrace::new);
         State {