Merge pull request #59 from subconsciousnetwork/async-compat-to-tokio…

…-util

chore: Consolidate on using tokio-util for stream compatibility

parsers/rust/subtext/Cargo.toml

@@ -6,7 +6,7 @@ license = "Apache-2.0"
 edition = "2021"
 
 [features]
-stream = ["tokio", "async-stream", "futures", "async-compat", "async-utf8-decoder"]
+stream = ["tokio", "tokio-util", "async-stream", "futures", "async-utf8-decoder"]
 
 [dependencies]
 tendril = "~0.4"
@@ -15,9 +15,9 @@ log = "~0.4"
 
 # For stream parsing only....
 tokio = { version = "^1", features = ["io-util", "macros", "test-util"], optional = true }
+tokio-util = { version = "0.7", features = ["compat"], optional = true }
 async-stream = { version = "~0.3", optional = true }
 futures = { version = "~0.3", optional = true }
-async-compat = { version = "~0.2", optional = true }
 async-utf8-decoder = { version = "~0.3", optional = true }
 
 [dev-dependencies]

parsers/rust/subtext/src/stream.rs

@@ -1,9 +1,9 @@
 use anyhow::{anyhow, Result};
-use async_compat::CompatExt;
 use async_stream::try_stream;
 use async_utf8_decoder::Utf8Decoder;
 use futures::{Stream, StreamExt};
 use tokio::io::AsyncRead;
+use tokio_util::compat::TokioAsyncReadCompatExt;
 
 use crate::{block::Block, parse, primitive::Entity};
 
@@ -56,9 +56,9 @@ where
 
 #[cfg(test)]
 mod tests {
-    use async_compat::CompatExt;
-    use futures::{channel::mpsc, io, SinkExt};
-    use futures::{pin_mut, StreamExt, TryStream, TryStreamExt};
+    use futures::{channel::mpsc, SinkExt};
+    use futures::{pin_mut, StreamExt, TryStreamExt};
+    use tokio_util::compat::{FuturesAsyncReadCompatExt};
 
     use crate::block::Block;
     use crate::primitive::Entity;