Skip to content

Commit

Permalink
refactor(s3): replace futures with futures-util
Browse files Browse the repository at this point in the history
  • Loading branch information
negezor committed Oct 5, 2024
1 parent ae995cd commit 5820e0a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions s3/src/bucket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ impl Bucket {
}

// Wait for all chunks to finish (or fail)
let responses = futures::future::join_all(handles).await;
let responses = futures_util::future::join_all(handles).await;

for response in responses {
let response_data = response?;
Expand Down Expand Up @@ -3015,7 +3015,7 @@ mod test {
#[cfg(feature = "with-async-std")]
use async_std::stream::StreamExt;
#[cfg(feature = "with-tokio")]
use futures::StreamExt;
use futures_util::stream::StreamExt;
#[cfg(not(any(feature = "with-tokio", feature = "with-async-std")))]
use std::fs::File;
#[cfg(not(any(feature = "with-tokio", feature = "with-async-std")))]
Expand Down
2 changes: 1 addition & 1 deletion s3/src/request/async_std_backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use async_std::io::Write as AsyncWrite;
use async_std::io::{ReadExt, WriteExt};
use async_std::stream::StreamExt;
use bytes::Bytes;
use futures::FutureExt;
use futures_util::future::FutureExt;
use std::collections::HashMap;

use crate::bucket::Bucket;
Expand Down
2 changes: 1 addition & 1 deletion s3/src/request/tokio_backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extern crate base64;
extern crate md5;

use bytes::Bytes;
use futures::TryStreamExt;
use futures_util::stream::TryStreamExt;
use maybe_async::maybe_async;
use std::collections::HashMap;
use std::str::FromStr as _;
Expand Down

0 comments on commit 5820e0a

Please sign in to comment.