fix(builder): add missing Send and Sync bounds to the builder

src/builder.rs

@@ -16,14 +16,14 @@ use crate::{
 ///
 /// This structure has methods for building up an archive from scratch into any
 /// arbitrary writer.
-pub struct Builder<W: Write + Unpin> {
+pub struct Builder<W: Write + Unpin + Send + Sync> {
     mode: HeaderMode,
     follow: bool,
     finished: bool,
     obj: Option<W>,
 }
 
-impl<W: Write + Unpin> Builder<W> {
+impl<W: Write + Unpin + Send + Sync> Builder<W> {
     /// Create a new archive builder with the underlying object as the
     /// destination of all data written. The builder will use
     /// `HeaderMode::Complete` by default.
@@ -116,7 +116,7 @@ impl<W: Write + Unpin> Builder<W> {
     /// #
     /// # Ok(()) }) }
     /// ```
-    pub async fn append<R: Read + Unpin>(
+    pub async fn append<R: Read + Unpin + Sync + Send>(
         &mut self,
         header: &Header,
         mut data: R,
@@ -170,7 +170,7 @@ impl<W: Write + Unpin> Builder<W> {
     /// #
     /// # Ok(()) }) }
     /// ```
-    pub async fn append_data<P: AsRef<Path>, R: Read + Unpin>(
+    pub async fn append_data<P: AsRef<Path>, R: Read + Unpin + Sync + Send>(
         &mut self,
         header: &mut Header,
         path: P,
@@ -406,9 +406,9 @@ impl<W: Write + Unpin> Builder<W> {
 }
 
 async fn append(
-    mut dst: &mut (dyn Write + Unpin),
+    mut dst: &mut (dyn Write + Unpin + Send + Sync),
     header: &Header,
-    mut data: &mut (dyn Read + Unpin),
+    mut data: &mut (dyn Read + Unpin + Send + Sync),
 ) -> io::Result<()> {
     dst.write_all(header.as_bytes()).await?;
     let len = io::copy(&mut data, &mut dst).await?;
@@ -424,7 +424,7 @@ async fn append(
 }
 
 async fn append_path_with_name(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Sync + Send),
     path: &Path,
     name: Option<&Path>,
     mode: HeaderMode,
@@ -478,7 +478,7 @@ async fn append_path_with_name(
 }
 
 async fn append_file(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     path: &Path,
     file: &mut fs::File,
     mode: HeaderMode,
@@ -489,7 +489,7 @@ async fn append_file(
 }
 
 async fn append_dir(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     path: &Path,
     src_path: &Path,
     mode: HeaderMode,
@@ -515,7 +515,7 @@ fn prepare_header(size: u64, entry_type: EntryType) -> Header {
 }
 
 async fn prepare_header_path(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     header: &mut Header,
     path: &Path,
 ) -> io::Result<()> {
@@ -544,7 +544,7 @@ async fn prepare_header_path(
 }
 
 async fn prepare_header_link(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     header: &mut Header,
     link_name: &Path,
 ) -> io::Result<()> {
@@ -562,10 +562,10 @@ async fn prepare_header_link(
 }
 
 async fn append_fs(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     path: &Path,
     meta: &fs::Metadata,
-    read: &mut (dyn Read + Unpin),
+    read: &mut (dyn Read + Unpin + Sync + Send),
     mode: HeaderMode,
     link_name: Option<&Path>,
 ) -> io::Result<()> {
@@ -583,7 +583,7 @@ async fn append_fs(
 }
 
 async fn append_dir_all(
-    dst: &mut (dyn Write + Unpin),
+    dst: &mut (dyn Write + Unpin + Send + Sync),
     path: &Path,
     src_path: &Path,
     mode: HeaderMode,
@@ -615,10 +615,18 @@ async fn append_dir_all(
     Ok(())
 }
 
-impl<W: Write + Unpin> Drop for Builder<W> {
+impl<W: Write + Unpin + Send + Sync> Drop for Builder<W> {
     fn drop(&mut self) {
         async_std::task::block_on(async move {
             let _ = self.finish().await;
         });
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    assert_impl_all!(async_std::fs::File: Send, Sync);
+    assert_impl_all!(Builder<async_std::fs::File>: Send, Sync);
+}

tests/all.rs

@@ -490,7 +490,7 @@ async fn extracting_malicious_tarball() {
 
     {
         let mut a = Builder::new(&mut evil_tar);
-        async fn append<R: Write + Unpin>(a: &mut Builder<R>, path: &'static str) {
+        async fn append<R: Write + Unpin + Send + Sync>(a: &mut Builder<R>, path: &'static str) {
             let mut header = Header::new_gnu();
             assert!(header.set_path(path).is_err(), "was ok: {:?}", path);
             {