Drop support for tokio 0.2/0.3

Author: Nemo157

Cargo.lock

@@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 # groups
 default = []
 all = ["all-implementations", "all-algorithms"]
-all-implementations = ["futures-io", "tokio-02", "tokio-03", "tokio"]
+all-implementations = ["futures-io", "tokio"]
 all-algorithms = ["brotli", "bzip2", "deflate", "gzip", "lzma", "xz", "zlib", "zstd"]
 
 # algorithms
@@ -41,8 +41,6 @@ pin-project-lite = "0.2.0"
 libzstd = { package = "zstd", version = "0.11.1", optional = true, default-features = false }
 zstd-safe = { version = "5.0.1", optional = true, default-features = false }
 memchr = "2.2.1"
-tokio-02 = { package = "tokio", version = "0.2.21", optional = true, default-features = false }
-tokio-03 = { package = "tokio", version = "0.3.0", optional = true, default-features = false }
 tokio = { version = "1.0.0", optional = true, default-features = false }
 
 [dev-dependencies]
@@ -52,12 +50,8 @@ rand = "0.8.5"
 futures = "0.3.5"
 futures-test = "0.3.5"
 ntest = "0.8.1"
-bytes-05 = { package = "bytes", version = "0.5.0" }
 bytes = "1.0.0"
-tokio-02 = { package = "tokio", version = "0.2.21", default-features = false, features = ["io-util", "stream", "macros", "io-std"] }
-tokio-03 = { package = "tokio", version = "0.3.0", default-features = false, features = ["io-util", "stream"] }
-tokio = { version = "1.0.0", default-features = false, features = ["io-util"] }
-tokio-util-04 = { package = "tokio-util", version = "0.4.0", default-features = false, features = ["io"] }
+tokio = { version = "1.0.0", default-features = false, features = ["io-util", "macros", "rt-multi-thread", "io-std"] }
 tokio-util-06 = { package = "tokio-util", version = "0.6.0", default-features = false, features = ["io"] }
 
 [[test]]
@@ -93,9 +87,9 @@ name = "zstd"
 required-features = ["zstd"]
 
 [[example]]
-name = "zlib_tokio_02_write"
-required-features = ["zlib", "tokio-02"]
+name = "zlib_tokio_write"
+required-features = ["zlib", "tokio"]
 
 [[example]]
 name = "zstd_gzip"
-required-features = ["zstd", "gzip", "tokio-02"]
+required-features = ["zstd", "gzip", "tokio"]

Cargo.toml

@@ -1,11 +1,10 @@
-use async_compression::tokio_02::write::ZlibDecoder;
-use async_compression::tokio_02::write::ZlibEncoder;
+use async_compression::tokio::write::ZlibDecoder;
+use async_compression::tokio::write::ZlibEncoder;
 
 use std::io::Result;
-use tokio_02::io::AsyncWriteExt as _; // for `write_all` and `shutdown`
+use tokio::io::AsyncWriteExt as _; // for `write_all` and `shutdown`
 
-use tokio_02 as tokio; // this enable the tokio main macro
-#[tokio_02::main]
+#[tokio::main]
 async fn main() -> Result<()> {
     let data = b"example";
     let compressed_data = compress(data).await?;

examples/zlib_tokio_02_write.rs renamed to examples/zlib_tokio_write.rs

@@ -1,21 +1,20 @@
-use async_compression::tokio_02::bufread::ZstdDecoder;
-use async_compression::tokio_02::write::GzipEncoder;
+use async_compression::tokio::bufread::ZstdDecoder;
+use async_compression::tokio::write::GzipEncoder;
 
 use std::io::Result;
-use tokio_02::io::stderr;
-use tokio_02::io::stdin;
-use tokio_02::io::stdout;
-use tokio_02::io::AsyncReadExt as _; // for `read_to_end`
-use tokio_02::io::AsyncWriteExt as _; // for `write_all` and `shutdown`
-use tokio_02::io::BufReader;
+use tokio::io::stderr;
+use tokio::io::stdin;
+use tokio::io::stdout;
+use tokio::io::AsyncReadExt as _; // for `read_to_end`
+use tokio::io::AsyncWriteExt as _; // for `write_all` and `shutdown`
+use tokio::io::BufReader;
 
 // Run this example by running the following in the terminal:
 // ```
 // echo 'example' | zstd | cargo run --example zstd_gzip --features="all" | gunzip -c                                                                                                                                                    ─╯
 // ```
 
-use tokio_02 as tokio; // this enable the tokio main macro
-#[tokio_02::main]
+#[tokio::main]
 async fn main() -> Result<()> {
     // Read zstd encoded data from stdin and decode
     let mut reader = ZstdDecoder::new(BufReader::new(stdin()));

examples/zstd_gzip.rs

@@ -37,22 +37,6 @@
     not(feature = "futures-io"),
     doc = "`futures-io` (*inactive*) | `futures::io::AsyncBufRead`, `futures::io::AsyncWrite`"
 )]
-#![cfg_attr(
-    feature = "tokio-02",
-    doc = "[`tokio-02`](crate::tokio_02) | [`tokio::io::AsyncBufRead`](::tokio_02::io::AsyncBufRead), [`tokio::io::AsyncWrite`](::tokio_02::io::AsyncWrite)"
-)]
-#![cfg_attr(
-    not(feature = "tokio-02"),
-    doc = "`tokio-02` (*inactive*) | `tokio::io::AsyncBufRead`, `tokio::io::AsyncWrite`"
-)]
-#![cfg_attr(
-    feature = "tokio-03",
-    doc = "[`tokio-03`](crate::tokio_03) | [`tokio::io::AsyncBufRead`](::tokio_03::io::AsyncBufRead), [`tokio::io::AsyncWrite`](::tokio_03::io::AsyncWrite)"
-)]
-#![cfg_attr(
-    not(feature = "tokio-03"),
-    doc = "`tokio-03` (*inactive*) | `tokio::io::AsyncBufRead`, `tokio::io::AsyncWrite`"
-)]
 #![cfg_attr(
     feature = "tokio",
     doc = "[`tokio`](crate::tokio) | [`tokio::io::AsyncBufRead`](::tokio::io::AsyncBufRead), [`tokio::io::AsyncWrite`](::tokio::io::AsyncWrite)"
@@ -156,12 +140,6 @@ pub mod futures;
 #[cfg(feature = "tokio")]
 #[cfg_attr(docsrs, doc(cfg(feature = "tokio")))]
 pub mod tokio;
-#[cfg(feature = "tokio-02")]
-#[cfg_attr(docsrs, doc(cfg(feature = "tokio-02")))]
-pub mod tokio_02;
-#[cfg(feature = "tokio-03")]
-#[cfg_attr(docsrs, doc(cfg(feature = "tokio-03")))]
-pub mod tokio_03;
 
 mod unshared;
 mod util;