diff --git a/examples/actix_multipart.rs b/examples/actix_multipart.rs index 38bf75d..eadef8e 100644 --- a/examples/actix_multipart.rs +++ b/examples/actix_multipart.rs @@ -13,7 +13,7 @@ mod inner { use actix_web::{web, App, HttpServer, Responder, ResponseError, Result}; use derive_more::{Display, Error}; use futures::StreamExt; - use futures_util::io::AsyncWriteExt; + use futures_lite::io::AsyncWriteExt; use tokio::fs::File; use uuid::Uuid; diff --git a/examples/cli_compress.rs b/examples/cli_compress.rs index cfd905a..5b8ec11 100644 --- a/examples/cli_compress.rs +++ b/examples/cli_compress.rs @@ -20,7 +20,7 @@ mod inner { use std::path::{Path, PathBuf}; use anyhow::{anyhow, bail, Result}; - use futures_util::io::AsyncReadExt; + use futures_lite::io::AsyncReadExt; use tokio::fs::File; async fn run() -> Result<()> { diff --git a/examples/file_extraction.rs b/examples/file_extraction.rs index 7eae394..193d627 100644 --- a/examples/file_extraction.rs +++ b/examples/file_extraction.rs @@ -69,7 +69,7 @@ async fn unzip_file(archive: File, out_dir: &Path) { .open(&path) .await .expect("Failed to create extracted file"); - futures_util::io::copy(&mut entry_reader, &mut writer.compat_write()) + futures_lite::io::copy(&mut entry_reader, &mut writer.compat_write()) .await .expect("Failed to copy to extracted file"); diff --git a/src/base/read/io/locator.rs b/src/base/read/io/locator.rs index e6e9f00..a2e9c5f 100644 --- a/src/base/read/io/locator.rs +++ b/src/base/read/io/locator.rs @@ -18,7 +18,7 @@ //! of a better algorithm for this (and have tested/verified its performance). #[cfg(doc)] -use futures_util::io::BufReader; +use futures_lite::io::BufReader; use crate::error::{Result as ZipResult, ZipError}; use crate::spec::consts::{EOCDR_LENGTH, EOCDR_SIGNATURE, SIGNATURE_LENGTH}; diff --git a/src/base/read/mem.rs b/src/base/read/mem.rs index a09169b..216f64b 100644 --- a/src/base/read/mem.rs +++ b/src/base/read/mem.rs @@ -17,7 +17,7 @@ //! ```no_run //! # use async_zip::base::read::mem::ZipFileReader; //! # use async_zip::error::Result; -//! # use futures_util::io::AsyncReadExt; +//! # use futures_lite::io::AsyncReadExt; //! # //! async fn run() -> Result<()> { //! let reader = ZipFileReader::new(Vec::new()).await?; @@ -43,7 +43,7 @@ //! ```no_run //! # use async_zip::base::read::mem::ZipFileReader; //! # use async_zip::error::Result; -//! # use futures_util::io::AsyncReadExt; +//! # use futures_lite::io::AsyncReadExt; //! # //! async fn run() -> Result<()> { //! let reader = ZipFileReader::new(Vec::new()).await?; diff --git a/src/base/read/seek.rs b/src/base/read/seek.rs index fa5c5f3..eee8f71 100644 --- a/src/base/read/seek.rs +++ b/src/base/read/seek.rs @@ -7,7 +7,7 @@ //! ```no_run //! # use async_zip::base::read::seek::ZipFileReader; //! # use async_zip::error::Result; -//! # use futures_util::io::AsyncReadExt; +//! # use futures_lite::io::AsyncReadExt; //! # use tokio::fs::File; //! # use tokio_util::compat::TokioAsyncReadCompatExt; //! # diff --git a/src/base/read/stream.rs b/src/base/read/stream.rs index a773568..ff85815 100644 --- a/src/base/read/stream.rs +++ b/src/base/read/stream.rs @@ -29,7 +29,7 @@ //! //! # Example //! ```no_run -//! # use futures_util::io::Cursor; +//! # use futures_lite::io::Cursor; //! # use async_zip::error::Result; //! # use async_zip::base::read::stream::ZipFileReader; //! # diff --git a/src/base/write/entry_whole.rs b/src/base/write/entry_whole.rs index a0b06a9..9ff8df1 100644 --- a/src/base/write/entry_whole.rs +++ b/src/base/write/entry_whole.rs @@ -15,7 +15,7 @@ use crate::spec::{ }; use crate::StringEncoding; #[cfg(any(feature = "deflate", feature = "bzip2", feature = "zstd", feature = "lzma", feature = "xz"))] -use futures_util::io::Cursor; +use futures_lite::io::Cursor; use crate::spec::consts::{NON_ZIP64_MAX_NUM_FILES, NON_ZIP64_MAX_SIZE}; #[cfg(any(feature = "deflate", feature = "bzip2", feature = "zstd", feature = "lzma", feature = "xz"))] diff --git a/src/base/write/mod.rs b/src/base/write/mod.rs index 649d098..5765f9c 100644 --- a/src/base/write/mod.rs +++ b/src/base/write/mod.rs @@ -30,7 +30,7 @@ //! # use async_zip::{Compression, ZipEntryBuilder, base::write::ZipFileWriter}; //! # use std::io::Cursor; //! # use async_zip::error::ZipError; -//! # use futures_util::io::AsyncWriteExt; +//! # use futures_lite::io::AsyncWriteExt; //! # use tokio_util::compat::TokioAsyncWriteCompatExt; //! # //! # async fn run() -> Result<(), ZipError> { diff --git a/src/spec/parse.rs b/src/spec/parse.rs index 6029422..422d468 100644 --- a/src/spec/parse.rs +++ b/src/spec/parse.rs @@ -331,7 +331,7 @@ mod tests { 0x50, 0x4B, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, ]; - let mut cursor = futures_util::io::Cursor::new(eocdl); + let mut cursor = futures_lite::io::Cursor::new(eocdl); let zip64eocdl = Zip64EndOfCentralDirectoryLocator::try_from_reader(&mut cursor).await.unwrap().unwrap(); assert_eq!( zip64eocdl, diff --git a/src/tests/read/compression/mod.rs b/src/tests/read/compression/mod.rs index 3c06713..eadd8d6 100644 --- a/src/tests/read/compression/mod.rs +++ b/src/tests/read/compression/mod.rs @@ -27,7 +27,7 @@ macro_rules! compressed_test_helper { #[cfg(test)] #[tokio::test] async fn $name() { - use futures_util::io::{AsyncReadExt, Cursor}; + use futures_lite::io::{AsyncReadExt, Cursor}; let data = $data; let data_raw = $data_raw; diff --git a/src/tests/read/locator/mod.rs b/src/tests/read/locator/mod.rs index bfa95ab..d08950c 100644 --- a/src/tests/read/locator/mod.rs +++ b/src/tests/read/locator/mod.rs @@ -29,7 +29,7 @@ fn search_two_byte_test() { #[tokio::test] async fn locator_empty_test() { - use futures_util::io::Cursor; + use futures_lite::io::Cursor; let data = &include_bytes!("empty.zip"); let mut cursor = Cursor::new(data); @@ -41,7 +41,7 @@ async fn locator_empty_test() { #[tokio::test] async fn locator_empty_max_comment_test() { - use futures_util::io::Cursor; + use futures_lite::io::Cursor; let data = &include_bytes!("empty-with-max-comment.zip"); let mut cursor = Cursor::new(data); @@ -53,7 +53,7 @@ async fn locator_empty_max_comment_test() { #[tokio::test] async fn locator_buffer_boundary_test() { - use futures_util::io::Cursor; + use futures_lite::io::Cursor; let data = &include_bytes!("empty-buffer-boundary.zip"); let mut cursor = Cursor::new(data); diff --git a/src/tests/read/zip64/mod.rs b/src/tests/read/zip64/mod.rs index 61ec5a4..758d410 100644 --- a/src/tests/read/zip64/mod.rs +++ b/src/tests/read/zip64/mod.rs @@ -2,7 +2,7 @@ // Copyright (c) 2023 Cognite AS // MIT License (https://github.com/Majored/rs-async-zip/blob/main/LICENSE) -use futures_util::io::AsyncReadExt; +use futures_lite::io::AsyncReadExt; use crate::tests::init_logger; diff --git a/src/tests/write/mod.rs b/src/tests/write/mod.rs index 6d4b8d6..6ca7571 100644 --- a/src/tests/write/mod.rs +++ b/src/tests/write/mod.rs @@ -1,7 +1,7 @@ // Copyright (c) 2022 Harry [Majored] [hello@majored.pw] // MIT License (https://github.com/Majored/rs-async-zip/blob/main/LICENSE) -use futures_util::io::AsyncWrite; +use futures_lite::io::AsyncWrite; use std::io::Error; use std::pin::Pin; use std::task::{Context, Poll}; diff --git a/src/tests/write/offset/mod.rs b/src/tests/write/offset/mod.rs index 1a58053..5ee9811 100644 --- a/src/tests/write/offset/mod.rs +++ b/src/tests/write/offset/mod.rs @@ -5,8 +5,8 @@ use crate::base::write::io::offset::AsyncOffsetWriter; #[tokio::test] async fn basic() { - use futures_util::io::AsyncWriteExt; - use futures_util::io::Cursor; + use futures_lite::io::AsyncWriteExt; + use futures_lite::io::Cursor; let mut writer = AsyncOffsetWriter::new(Cursor::new(Vec::new())); assert_eq!(writer.offset(), 0); diff --git a/src/tests/write/zip64/mod.rs b/src/tests/write/zip64/mod.rs index 77d3396..01f3211 100644 --- a/src/tests/write/zip64/mod.rs +++ b/src/tests/write/zip64/mod.rs @@ -9,7 +9,7 @@ use crate::{Compression, ZipEntryBuilder}; use std::io::Read; use crate::spec::header::ExtraField; -use futures_util::io::AsyncWriteExt; +use futures_lite::io::AsyncWriteExt; // Useful constants for writing a large file. const BATCH_SIZE: usize = 100_000; @@ -100,7 +100,7 @@ async fn test_write_large_zip64_file() { /// Test writing a file, and reading it with async-zip #[tokio::test] async fn test_write_large_zip64_file_self_read() { - use futures_util::io::AsyncReadExt; + use futures_lite::io::AsyncReadExt; init_logger(); diff --git a/src/tokio/read/fs.rs b/src/tokio/read/fs.rs index 1a2fb97..7cb2329 100644 --- a/src/tokio/read/fs.rs +++ b/src/tokio/read/fs.rs @@ -17,7 +17,7 @@ //! ```no_run //! # use async_zip::tokio::read::fs::ZipFileReader; //! # use async_zip::error::Result; -//! # use futures_util::io::AsyncReadExt; +//! # use futures_lite::io::AsyncReadExt; //! # //! async fn run() -> Result<()> { //! let reader = ZipFileReader::new("./foo.zip").await?; @@ -43,7 +43,7 @@ //! ```no_run //! # use async_zip::tokio::read::fs::ZipFileReader; //! # use async_zip::error::Result; -//! # use futures_util::io::AsyncReadExt; +//! # use futures_lite::io::AsyncReadExt; //! # //! async fn run() -> Result<()> { //! let reader = ZipFileReader::new("./foo.zip").await?; @@ -77,7 +77,7 @@ use crate::file::ZipFile; use std::path::{Path, PathBuf}; use std::sync::Arc; -use futures_util::io::BufReader; +use futures_lite::io::BufReader; use tokio::fs::File; use tokio_util::compat::{Compat, TokioAsyncReadCompatExt}; diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 6f19af3..22abc43 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -6,7 +6,7 @@ use async_zip::base::read::seek; use async_zip::base::write::ZipFileWriter; use async_zip::Compression; use async_zip::ZipEntryBuilder; -use futures_util::io::AsyncWriteExt; +use futures_lite::io::AsyncWriteExt; use tokio::fs::File; use tokio_util::compat::TokioAsyncReadCompatExt; diff --git a/tests/compress_test.rs b/tests/compress_test.rs index c7a85da..9efa7e8 100644 --- a/tests/compress_test.rs +++ b/tests/compress_test.rs @@ -2,7 +2,7 @@ // MIT License (https://github.com/Majored/rs-async-zip/blob/main/LICENSE) use async_zip::{Compression, ZipEntryBuilder, ZipString}; -use futures_util::AsyncWriteExt; +use futures_lite::AsyncWriteExt; mod common;