From eca6955f07ff9cf43eaf99481e7006d6a7cfdaa5 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 21 Feb 2025 16:24:53 +0100
Subject: [PATCH] Remove explicit imports of std::future::Future, as it is now
 in the prelude

---
 crates/cli/src/lifecycle.rs           | 2 +-
 crates/http/src/reqwest.rs            | 1 -
 crates/listener/src/server.rs         | 1 -
 crates/tower/src/metrics/duration.rs  | 2 +-
 crates/tower/src/metrics/in_flight.rs | 2 --
 crates/tower/src/tracing/future.rs    | 2 +-
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/cli/src/lifecycle.rs b/crates/cli/src/lifecycle.rs
index aa79d2114..4a2c429d1 100644
--- a/crates/cli/src/lifecycle.rs
+++ b/crates/cli/src/lifecycle.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-use std::{future::Future, process::ExitCode, time::Duration};
+use std::{process::ExitCode, time::Duration};
 
 use futures_util::future::{BoxFuture, Either};
 use mas_handlers::ActivityTracker;
diff --git a/crates/http/src/reqwest.rs b/crates/http/src/reqwest.rs
index d14414709..b75d7fb07 100644
--- a/crates/http/src/reqwest.rs
+++ b/crates/http/src/reqwest.rs
@@ -4,7 +4,6 @@
 // Please see LICENSE in the repository root for full details.
 
 use std::{
-    future::Future,
     str::FromStr,
     sync::{Arc, LazyLock},
     time::Duration,
diff --git a/crates/listener/src/server.rs b/crates/listener/src/server.rs
index e4c6e77ad..b022455bb 100644
--- a/crates/listener/src/server.rs
+++ b/crates/listener/src/server.rs
@@ -5,7 +5,6 @@
 // Please see LICENSE in the repository root for full details.
 
 use std::{
-    future::Future,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
diff --git a/crates/tower/src/metrics/duration.rs b/crates/tower/src/metrics/duration.rs
index 4489c3f9f..e0664fb31 100644
--- a/crates/tower/src/metrics/duration.rs
+++ b/crates/tower/src/metrics/duration.rs
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-use std::{future::Future, time::Instant};
+use std::time::Instant;
 
 use opentelemetry::{KeyValue, metrics::Histogram};
 use pin_project_lite::pin_project;
diff --git a/crates/tower/src/metrics/in_flight.rs b/crates/tower/src/metrics/in_flight.rs
index fdf48e2aa..8f362c6cb 100644
--- a/crates/tower/src/metrics/in_flight.rs
+++ b/crates/tower/src/metrics/in_flight.rs
@@ -4,8 +4,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-use std::future::Future;
-
 use opentelemetry::{KeyValue, metrics::UpDownCounter};
 use pin_project_lite::pin_project;
 use tower::{Layer, Service};
diff --git a/crates/tower/src/tracing/future.rs b/crates/tower/src/tracing/future.rs
index f116388ef..aeec33f39 100644
--- a/crates/tower/src/tracing/future.rs
+++ b/crates/tower/src/tracing/future.rs
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-use std::{future::Future, task::ready};
+use std::task::ready;
 
 use pin_project_lite::pin_project;
 use tracing::Span;