From 34aa7fee548cad5c402d2b511ed73a33d59deb4d Mon Sep 17 00:00:00 2001
From: aumetra <aumetra@cryptolab.net>
Date: Fri, 2 Feb 2024 14:01:13 +0100
Subject: [PATCH 1/2] Remove dependency on `futures-channel` in favour of
 `tokio` primitives

---
 bb8/Cargo.toml    | 3 +--
 bb8/tests/test.rs | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bb8/Cargo.toml b/bb8/Cargo.toml
index 45b1aa3..fecc382 100644
--- a/bb8/Cargo.toml
+++ b/bb8/Cargo.toml
@@ -11,8 +11,7 @@ readme = "../README.md"
 
 [dependencies]
 async-trait = "0.1"
-futures-channel = "0.3.2"
-futures-util = { version = "0.3.2", default-features = false, features = ["channel"] }
+futures-util = { version = "0.3.2", default-features = false, features = ["alloc"] }
 parking_lot = { version = "0.12", optional = true }
 tokio = { version = "1.0", features = ["rt", "sync", "time"] }
 
diff --git a/bb8/tests/test.rs b/bb8/tests/test.rs
index 43e233d..13e5bb4 100644
--- a/bb8/tests/test.rs
+++ b/bb8/tests/test.rs
@@ -11,10 +11,9 @@ use std::time::Duration;
 use std::{error, fmt};
 
 use async_trait::async_trait;
-use futures_channel::oneshot;
 use futures_util::future::{err, lazy, ok, pending, ready, try_join_all, FutureExt};
 use futures_util::stream::{FuturesUnordered, TryStreamExt};
-use tokio::time::timeout;
+use tokio::{time::timeout, sync::oneshot};
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct Error;

From c92afc97cdceb5fd3b277a35ab4c8108580d9d4c Mon Sep 17 00:00:00 2001
From: aumetra <aumetra@cryptolab.net>
Date: Fri, 2 Feb 2024 14:02:56 +0100
Subject: [PATCH 2/2] cargo fmt

---
 bb8/tests/test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bb8/tests/test.rs b/bb8/tests/test.rs
index 13e5bb4..1c4658c 100644
--- a/bb8/tests/test.rs
+++ b/bb8/tests/test.rs
@@ -13,7 +13,7 @@ use std::{error, fmt};
 use async_trait::async_trait;
 use futures_util::future::{err, lazy, ok, pending, ready, try_join_all, FutureExt};
 use futures_util::stream::{FuturesUnordered, TryStreamExt};
-use tokio::{time::timeout, sync::oneshot};
+use tokio::{sync::oneshot, time::timeout};
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct Error;