Use tokio SyncIoBridge

We can only land this after a new tokio is released with
tokio-rs/tokio#4146

lib/Cargo.toml

@@ -38,7 +38,7 @@ structopt = "0.3.21"
 tar = "0.4.33"
 tempfile = "3.2.0"
 tokio = { features = ["full"], version = "1" }
-tokio-util = { features = ["io"], version = "0.6" }
+tokio-util = { features = ["io-util"], version = "0.6.9" }
 tracing = "0.1"
 
 [dev-dependencies]

lib/src/lib.rs

@@ -22,7 +22,6 @@ pub use ostree::gio::glib;
 /// to a string to output to a terminal or logs.
 type Result<T> = anyhow::Result<T>;
 
-mod async_util;
 pub mod cli;
 pub mod container;
 pub mod diff;

lib/src/tar/import.rs

@@ -1,6 +1,5 @@
 //! APIs for extracting OSTree commits from container images
 
-use crate::async_util::ReadBridge;
 use crate::Result;
 use anyhow::{anyhow, Context};
 use camino::Utf8Path;
@@ -603,7 +602,7 @@ pub async fn import_tar(
     options: Option<TarImportOptions>,
 ) -> Result<String> {
     let options = options.unwrap_or_default();
-    let src = ReadBridge::new(src);
+    let src = tokio_util::io::SyncIoBridge::new(src);
     let repo = repo.clone();
     let import = crate::tokio_util::spawn_blocking_cancellable(move |cancellable| {
         let mut archive = tar::Archive::new(src);

lib/src/tar/write.rs

@@ -7,7 +7,6 @@
 //! In the future, this may also evolve into parsing the tar
 //! stream in Rust, not in C.
 
-use crate::async_util::{ReadBridge, WriteBridge};
 use crate::cmdext::CommandRedirectionExt;
 use crate::Result;
 use anyhow::{anyhow, Context};
@@ -163,9 +162,10 @@ async fn filter_tar_async(
     mut dest: impl AsyncWrite + Send + Unpin,
 ) -> Result<BTreeMap<String, u32>> {
     let (tx_buf, mut rx_buf) = tokio::io::duplex(8192);
+    let src = Box::pin(src);
     let tar_transformer = tokio::task::spawn_blocking(move || -> Result<_> {
-        let src = ReadBridge::new(src);
-        let dest = WriteBridge::new(tx_buf);
+        let src = tokio_util::io::SyncIoBridge::new(src);
+        let dest = tokio_util::io::SyncIoBridge::new(tx_buf);
         filter_tar(src, dest)
     });
     let copier = tokio::io::copy(&mut rx_buf, &mut dest);