From eaeb7620d96f01ce4fa1b65aaec306ebf19e777c Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 21 May 2024 22:09:21 -0700
Subject: [PATCH] enable `multiple_bound_locations` lint

---
 Cargo.toml                   | 1 -
 src/api/appservice_server.rs | 4 ++--
 src/api/server_server.rs     | 4 ++--
 src/service/pusher.rs        | 4 ++--
 src/service/sending.rs       | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c780ad34..6e563018 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,6 @@ wildcard_dependencies = "warn"
 missing_errors_doc = "allow"
 missing_panics_doc = "allow"
 
-multiple_bound_locations = "allow"
 option_as_ref_cloned = "allow"
 thread_local_initializer_can_be_made_const = "allow"
 unnecessary_to_owned = "allow"
diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs
index fbf03179..b6ef0465 100644
--- a/src/api/appservice_server.rs
+++ b/src/api/appservice_server.rs
@@ -14,12 +14,12 @@ use crate::{services, utils, Error, Result};
 /// Only returns None if there is no url specified in the appservice
 /// registration file
 #[tracing::instrument(skip(request))]
-pub(crate) async fn send_request<T: OutgoingRequest>(
+pub(crate) async fn send_request<T>(
     registration: Registration,
     request: T,
 ) -> Result<Option<T::IncomingResponse>>
 where
-    T: Debug,
+    T: OutgoingRequest + Debug,
 {
     let Some(destination) = registration.url else {
         return Ok(None);
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 63fffd4a..2455f2b0 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -128,12 +128,12 @@ impl FedDest {
 }
 
 #[tracing::instrument(skip(request), fields(destination_cache_result))]
-pub(crate) async fn send_request<T: OutgoingRequest>(
+pub(crate) async fn send_request<T>(
     destination: &ServerName,
     request: T,
 ) -> Result<T::IncomingResponse>
 where
-    T: Debug,
+    T: OutgoingRequest + Debug,
 {
     if !services().globals.allow_federation() {
         return Err(Error::BadConfig("Federation is disabled."));
diff --git a/src/service/pusher.rs b/src/service/pusher.rs
index 82bc7497..94cb7fb4 100644
--- a/src/service/pusher.rs
+++ b/src/service/pusher.rs
@@ -62,13 +62,13 @@ impl Service {
     }
 
     #[tracing::instrument(skip(self, destination, request))]
-    pub(crate) async fn send_request<T: OutgoingRequest>(
+    pub(crate) async fn send_request<T>(
         &self,
         destination: &str,
         request: T,
     ) -> Result<T::IncomingResponse>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         let destination = destination.replace("/_matrix/push/v1/notify", "");
 
diff --git a/src/service/sending.rs b/src/service/sending.rs
index 531ca3f2..c0fd0fd9 100644
--- a/src/service/sending.rs
+++ b/src/service/sending.rs
@@ -867,13 +867,13 @@ impl Service {
     }
 
     #[tracing::instrument(skip(self, request))]
-    pub(crate) async fn send_federation_request<T: OutgoingRequest>(
+    pub(crate) async fn send_federation_request<T>(
         &self,
         destination: &ServerName,
         request: T,
     ) -> Result<T::IncomingResponse>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         debug!("Waiting for permit");
         let permit = self.maximum_requests.acquire().await;
@@ -900,13 +900,13 @@ impl Service {
         skip(self, registration, request),
         fields(appservice_id = registration.id),
     )]
-    pub(crate) async fn send_appservice_request<T: OutgoingRequest>(
+    pub(crate) async fn send_appservice_request<T>(
         &self,
         registration: Registration,
         request: T,
     ) -> Result<Option<T::IncomingResponse>>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         let permit = self.maximum_requests.acquire().await;
         let response =