Merge branch 'master' into dependabot/cargo/tokio-tungstenite-0.27

Author: tyranron

juniper/CHANGELOG.md

@@ -92,6 +92,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
     - `From` and `Display` implementations are not derived anymore (recommended way is to use [`derive_more` crate] for this).
 - `#[derive(GraphQLScalar)]` and `#[graphql_scalar]` macros: ([#1327])
     - Made provided `from_input()` function to accept `ScalarValue` (or anything `TryScalarValueTo`-convertible) directly instead of `InputValue`.
+- Removed `LocalBoxFuture` usage from `http::tests::WsIntegration` trait. ([todo])
 
 ### Added
 
@@ -145,6 +146,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
 [#1327]: /../../pull/1327
 [1b1fc618]: /../../commit/1b1fc61879ffdd640d741e187dc20678bf7ab295
 [20609366]: /../../commit/2060936635609b0186d46d8fbd06eb30fce660e3
+[todo]: /../../commit/todo
 
 
 

juniper/src/http/mod.rs

@@ -376,8 +376,6 @@ pub mod tests {
 
     use serde_json::Value as Json;
 
-    use crate::LocalBoxFuture;
-
     /// Normalized response content we expect to get back from
     /// the http framework integration we are testing.
     #[derive(Debug)]
@@ -653,7 +651,7 @@ pub mod tests {
         fn run(
             &self,
             messages: Vec<WsIntegrationMessage>,
-        ) -> LocalBoxFuture<Result<(), anyhow::Error>>;
+        ) -> impl Future<Output = Result<(), anyhow::Error>>;
     }
 
     /// WebSocket framework integration message.

juniper_actix/src/lib.rs

@@ -758,7 +758,7 @@ mod subscription_tests {
     use actix_test::start;
     use actix_web::{App, Error, HttpRequest, HttpResponse, web};
     use juniper::{
-        EmptyMutation, LocalBoxFuture,
+        EmptyMutation,
         futures::{SinkExt, StreamExt},
         http::tests::{WsIntegration, WsIntegrationMessage, graphql_transport_ws, graphql_ws},
         tests::fixtures::starwars::schema::{Database, Query, Subscription},
@@ -770,11 +770,8 @@ mod subscription_tests {
 
     struct TestWsIntegration(&'static str);
 
-    impl TestWsIntegration {
-        async fn run_async(
-            &self,
-            messages: Vec<WsIntegrationMessage>,
-        ) -> Result<(), anyhow::Error> {
+    impl WsIntegration for TestWsIntegration {
+        async fn run(&self, messages: Vec<WsIntegrationMessage>) -> Result<(), anyhow::Error> {
             let proto = self.0;
 
             let mut server = start(|| {
@@ -837,15 +834,6 @@ mod subscription_tests {
         }
     }
 
-    impl WsIntegration for TestWsIntegration {
-        fn run(
-            &self,
-            messages: Vec<WsIntegrationMessage>,
-        ) -> LocalBoxFuture<'_, Result<(), anyhow::Error>> {
-            Box::pin(self.run_async(messages))
-        }
-    }
-
     type Schema = juniper::RootNode<Query, EmptyMutation<Database>, Subscription>;
 
     fn subscription(

juniper_axum/tests/ws_test_suite.rs

@@ -9,7 +9,7 @@ use anyhow::anyhow;
 use axum::{Extension, Router, routing::get};
 use futures::{SinkExt, StreamExt};
 use juniper::{
-    EmptyMutation, LocalBoxFuture, RootNode,
+    EmptyMutation, RootNode,
     http::tests::{WsIntegration, WsIntegrationMessage, graphql_transport_ws, graphql_ws},
     tests::fixtures::starwars::schema::{Database, Query, Subscription},
 };
@@ -23,7 +23,6 @@ use tokio_tungstenite::{MaybeTlsStream, WebSocketStream, connect_async, tungsten
 
 type Schema = RootNode<Query, EmptyMutation<Database>, Subscription>;
 
-#[derive(Clone)]
 struct TestApp(Router);
 
 impl TestApp {
@@ -51,27 +50,6 @@ impl TestApp {
         Self(router)
     }
 
-    async fn run(self, messages: Vec<WsIntegrationMessage>) -> Result<(), anyhow::Error> {
-        let listener = TcpListener::bind("0.0.0.0:0".parse::<SocketAddr>().unwrap())
-            .await
-            .unwrap();
-        let addr = listener.local_addr().unwrap();
-
-        tokio::spawn(async move {
-            axum::serve(listener, self.0).await.unwrap();
-        });
-
-        let (mut websocket, _) = connect_async(format!("ws://{}/subscriptions", addr))
-            .await
-            .unwrap();
-
-        for msg in messages {
-            Self::process_message(&mut websocket, msg).await?;
-        }
-
-        Ok(())
-    }
-
     async fn process_message(
         websocket: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
         message: WsIntegrationMessage,
@@ -122,11 +100,26 @@ impl TestApp {
 }
 
 impl WsIntegration for TestApp {
-    fn run(
-        &self,
-        messages: Vec<WsIntegrationMessage>,
-    ) -> LocalBoxFuture<'_, Result<(), anyhow::Error>> {
-        Box::pin(self.clone().run(messages))
+    async fn run(&self, messages: Vec<WsIntegrationMessage>) -> Result<(), anyhow::Error> {
+        let listener = TcpListener::bind("0.0.0.0:0".parse::<SocketAddr>().unwrap())
+            .await
+            .unwrap();
+        let addr = listener.local_addr().unwrap();
+
+        let router = self.0.clone();
+        tokio::spawn(async move {
+            axum::serve(listener, router).await.unwrap();
+        });
+
+        let (mut websocket, _) = connect_async(format!("ws://{}/subscriptions", addr))
+            .await
+            .unwrap();
+
+        for msg in messages {
+            Self::process_message(&mut websocket, msg).await?;
+        }
+
+        Ok(())
     }
 }