From aa3f046f682e0a200f18c6d80af658edf54347be Mon Sep 17 00:00:00 2001
From: Juhan Oskar Hennoste <juhanoskar@gmail.com>
Date: Sat, 20 Jul 2024 23:06:01 +0300
Subject: [PATCH] Make swf::error::Error implement Send + Sync

---
 swf/src/error.rs | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/swf/src/error.rs b/swf/src/error.rs
index fb8a07f97..58b877e3a 100644
--- a/swf/src/error.rs
+++ b/swf/src/error.rs
@@ -11,7 +11,7 @@ pub enum Error {
     /// This can contain sub-errors with further information (`Error::source`)
     Avm1ParseError {
         opcode: u8,
-        source: Option<Box<dyn error::Error + 'static>>,
+        source: Option<Box<dyn error::Error + Send + Sync + 'static>>,
     },
 
     /// Invalid or unknown data was encountered.
@@ -21,7 +21,7 @@ pub enum Error {
     /// This can contain sub-errors with further information (`Error::source`)
     SwfParseError {
         tag_code: u16,
-        source: Box<dyn error::Error + 'static>,
+        source: Box<dyn error::Error + Send + Sync + 'static>,
     },
 
     /// An IO error occurred (probably unexpected EOF).
@@ -43,7 +43,10 @@ impl Error {
 
     /// Helper method to create `Error::Avm1ParseError`.
     #[inline]
-    pub fn avm1_parse_error_with_source(opcode: u8, source: impl error::Error + 'static) -> Self {
+    pub fn avm1_parse_error_with_source(
+        opcode: u8,
+        source: impl error::Error + Send + Sync + 'static,
+    ) -> Self {
         Self::Avm1ParseError {
             opcode,
             source: Some(Box::new(source)),
@@ -58,7 +61,10 @@ impl Error {
 
     /// Helper method to create `Error::SwfParseError`.
     #[inline]
-    pub fn swf_parse_error(tag_code: u16, source: impl error::Error + 'static) -> Self {
+    pub fn swf_parse_error(
+        tag_code: u16,
+        source: impl error::Error + Send + Sync + 'static,
+    ) -> Self {
         Self::SwfParseError {
             tag_code,
             source: Box::new(source),
@@ -99,9 +105,11 @@ impl fmt::Display for Error {
 
 impl error::Error for Error {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        use std::ops::Deref;
         match self {
-            Self::Avm1ParseError { source, .. } => source.as_ref().map(|s| s.deref()),
+            Self::Avm1ParseError { source, .. } => match source {
+                Some(s) => Some(s.as_ref()),
+                None => None,
+            },
             Self::IoError(e) => e.source(),
             Self::InvalidData(_) => None,
             Self::SwfParseError { source, .. } => Some(source.as_ref()),
@@ -115,3 +123,10 @@ impl From<io::Error> for Error {
         Self::IoError(error)
     }
 }
+
+#[cfg(test)]
+#[test]
+fn test_error_send_sync() {
+    fn assert_send_sync<T: Send + Sync>() {}
+    assert_send_sync::<Error>()
+}