diff --git a/Cargo.toml b/Cargo.toml index 788ceee..baa1305 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ time = { version = "0.3.10", features = [ "serde-human-readable", "serde-well-known", ] } -futures = "0.3.21" +futures-util = "0.3.31" ress = "0.11.0" phf = "0.11.0" phf_codegen = "0.11.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index d993126..3fb1441 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -45,7 +45,7 @@ rustypipe = { workspace = true, features = ["rss"] } rustypipe-downloader.workspace = true reqwest.workspace = true tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } -futures.workspace = true +futures-util.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/cli/src/main.rs b/cli/src/main.rs index 7517568..99eb039 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -10,7 +10,7 @@ use std::{ use clap::{Parser, Subcommand, ValueEnum}; use const_format::formatcp; -use futures::stream::{self, StreamExt}; +use futures_util::stream::{self, StreamExt}; use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; use owo_colors::OwoColorize; use rustypipe::{ diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index 7a0e5d1..024d8e5 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -12,7 +12,7 @@ publish = false rustypipe = { path = "../" } reqwest.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } -futures.workspace = true +futures-util.workspace = true serde.workspace = true serde_json.workspace = true serde_with.workspace = true diff --git a/codegen/src/abtest.rs b/codegen/src/abtest.rs index 071a400..c50db7d 100644 --- a/codegen/src/abtest.rs +++ b/codegen/src/abtest.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use anyhow::{bail, Result}; -use futures::{stream, StreamExt}; +use futures_util::{stream, StreamExt}; use indicatif::{ProgressBar, ProgressStyle}; use num_enum::TryFromPrimitive; use once_cell::sync::Lazy; diff --git a/codegen/src/collect_album_types.rs b/codegen/src/collect_album_types.rs index 965f37d..b245ba9 100644 --- a/codegen/src/collect_album_types.rs +++ b/codegen/src/collect_album_types.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, fs::File, io::BufReader}; -use futures::stream::{self, StreamExt}; +use futures_util::stream::{self, StreamExt}; use path_macro::path; use rustypipe::{ client::{ClientType, RustyPipe, RustyPipeQuery}, diff --git a/codegen/src/collect_large_numbers.rs b/codegen/src/collect_large_numbers.rs index e9ebbb7..b8bb08e 100644 --- a/codegen/src/collect_large_numbers.rs +++ b/codegen/src/collect_large_numbers.rs @@ -6,7 +6,7 @@ use std::{ }; use anyhow::{Context, Result}; -use futures::{stream, StreamExt}; +use futures_util::{stream, StreamExt}; use once_cell::sync::Lazy; use path_macro::path; use regex::Regex; diff --git a/codegen/src/collect_playlist_dates.rs b/codegen/src/collect_playlist_dates.rs index 12279cf..4dbc782 100644 --- a/codegen/src/collect_playlist_dates.rs +++ b/codegen/src/collect_playlist_dates.rs @@ -5,7 +5,7 @@ use std::{ io::BufReader, }; -use futures::{stream, StreamExt}; +use futures_util::{stream, StreamExt}; use ordered_hash_map::OrderedHashMap; use path_macro::path; use rustypipe::{ diff --git a/codegen/src/collect_video_dates.rs b/codegen/src/collect_video_dates.rs index 472df8c..38a157a 100644 --- a/codegen/src/collect_video_dates.rs +++ b/codegen/src/collect_video_dates.rs @@ -3,7 +3,7 @@ use std::{ fs::File, }; -use futures::{stream, StreamExt}; +use futures_util::{stream, StreamExt}; use path_macro::path; use rustypipe::{ client::{RustyPipe, RustyPipeQuery}, diff --git a/codegen/src/collect_video_durations.rs b/codegen/src/collect_video_durations.rs index fd097e9..9ee06df 100644 --- a/codegen/src/collect_video_durations.rs +++ b/codegen/src/collect_video_durations.rs @@ -5,7 +5,7 @@ use std::{ }; use anyhow::Result; -use futures::{stream, StreamExt}; +use futures_util::{stream, StreamExt}; use path_macro::path; use rustypipe::{ client::{ClientType, RustyPipe, RustyPipeQuery}, diff --git a/downloader/Cargo.toml b/downloader/Cargo.toml index 9369331..0f4ba5d 100644 --- a/downloader/Cargo.toml +++ b/downloader/Cargo.toml @@ -37,7 +37,7 @@ rustypipe.workspace = true once_cell.workspace = true regex.workspace = true thiserror.workspace = true -futures.workspace = true +futures-util.workspace = true reqwest = { workspace = true, features = ["stream"] } rand.workspace = true tokio = { workspace = true, features = ["macros", "fs", "process"] } diff --git a/downloader/src/lib.rs b/downloader/src/lib.rs index 97a51c4..f30af85 100644 --- a/downloader/src/lib.rs +++ b/downloader/src/lib.rs @@ -15,7 +15,7 @@ use std::{ time::Duration, }; -use futures::stream::{self, StreamExt}; +use futures_util::stream::{self, StreamExt}; use once_cell::sync::Lazy; use rand::Rng; use regex::Regex;