From 8ffe09381cbcc4acee06f1fddf4534d822203fc7 Mon Sep 17 00:00:00 2001
From: Ethan Girouard <mr.egirouard@gmail.com>
Date: Thu, 16 May 2024 19:23:48 -0400
Subject: [PATCH] Remove futures dependency

Use tokio::join instead of futures::join
---
 Cargo.lock    | 1 -
 Cargo.toml    | 2 --
 src/search.rs | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b2514e..4b7af41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1576,7 +1576,6 @@ dependencies = [
  "diesel_migrations",
  "dotenv",
  "flexi_logger",
- "futures",
  "http",
  "icondata",
  "lazy_static",
diff --git a/Cargo.toml b/Cargo.toml
index 9814f9a..2e46758 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,6 @@ openssl = { version = "0.10.63", optional = true }
 time = { version = "0.3.34", features = ["serde"], default-features = false }
 diesel_migrations = { version = "2.1.0", optional = true }
 pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
-futures = { version = "0.3.30", default-features = false, optional = true }
 tokio = { version = "1", optional = true, features = ["rt-multi-thread"] }
 axum = { version = "0.7.5", optional = true }
 tower = { version = "0.4.13", optional = true }
@@ -61,7 +60,6 @@ ssr = [
   "openssl",
   "diesel_migrations",
   "pbkdf2",
-  "futures",
   "tokio",
   "axum",
   "tower",
diff --git a/src/search.rs b/src/search.rs
index 3b24f08..dd3aeb8 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -102,7 +102,7 @@ pub async fn search(query: String, limit: i64) -> Result<(Vec<Album>, Vec<Artist
 	let artists = search_artists(query.clone(), limit);
 	let songs = search_songs(query.clone(), limit);
 
-	use futures::join;
+	use tokio::join;
 
 	let (albums, artists, songs) = join!(albums, artists, songs);
 	Ok((albums?, artists?, songs?))