Rebox future segmentations.

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/client/membership/join.rs

@@ -2,7 +2,7 @@ use std::{borrow::Borrow, collections::HashMap, iter::once, sync::Arc};
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use futures::{FutureExt, StreamExt};
+use futures::{FutureExt, StreamExt, pin_mut};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, OwnedRoomId, OwnedServerName, OwnedUserId, RoomId,
 	RoomVersionId, UserId,
@@ -747,7 +747,7 @@ async fn join_room_by_id_helper_local(
 			})
 			.await
 		{
-			services
+			let users = services
 				.rooms
 				.state_cache
 				.local_users_in_room(room_id)
@@ -759,10 +759,10 @@ async fn join_room_by_id_helper_local(
 						&state_lock,
 					)
 				})
-				.boxed()
-				.next()
-				.await
-				.map(ToOwned::to_owned)
+				.map(ToOwned::to_owned);
+
+			pin_mut!(users);
+			users.next().await
 		} else {
 			None
 		}

src/api/client/message.rs

@@ -100,7 +100,6 @@ pub(crate) async fn get_message_events_route(
 			.rooms
 			.timeline
 			.backfill_if_required(room_id, from)
-			.boxed()
 			.await
 			.log_err()
 			.ok();

src/api/client/relations.rs

@@ -175,7 +175,7 @@ async fn paginate_relations_with_filter(
 	})
 }
 
-async fn visibility_filter<Pdu: Event + Send + Sync>(
+async fn visibility_filter<Pdu: Event>(
 	services: &Services,
 	sender_user: &UserId,
 	item: (PduCount, Pdu),

src/api/client/sync/v3.rs

@@ -728,7 +728,6 @@ async fn load_joined_room(
 		joined_since_last_sync,
 		witness.as_ref(),
 	)
-	.boxed()
 	.await?;
 
 	let is_sender_membership = |pdu: &PduEvent| {
@@ -1075,8 +1074,7 @@ async fn calculate_state_incremental<'a>(
 					.rooms
 					.state_accessor
 					.state_full_shortids(current_shortstatehash)
-					.expect_ok()
-					.boxed(),
+					.expect_ok(),
 			)
 		})
 		.into();
@@ -1108,6 +1106,7 @@ async fn calculate_state_incremental<'a>(
 				.ok()
 		})
 		.collect::<Vec<_>>()
+		.boxed()
 		.await;
 
 	let (device_list_updates, left_encrypted_users) = state_events