From 35f56c415a89f4deaaef4f73882b2e7b5e21c3ed Mon Sep 17 00:00:00 2001 From: Joey de Waal Date: Mon, 9 Dec 2024 19:31:46 +0100 Subject: [PATCH] remove BoxFuture's in WithSocket --- Cargo.lock | 12 ++++++------ sqlx-core/src/net/socket/mod.rs | 12 ++++++------ sqlx-core/src/net/tls/mod.rs | 4 ++-- sqlx-mysql/src/connection/establish.rs | 9 ++++----- sqlx-mysql/src/connection/tls.rs | 2 +- sqlx-postgres/src/connection/stream.rs | 2 +- sqlx-postgres/src/connection/tls.rs | 8 +++----- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2da47afa54..36cb94422e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1177,7 +1177,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", ] [[package]] @@ -1914,7 +1914,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", ] [[package]] @@ -3986,7 +3986,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", ] [[package]] @@ -4815,7 +4815,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", "synstructure", ] @@ -4856,7 +4856,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", "synstructure", ] @@ -4899,5 +4899,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.87", ] diff --git a/sqlx-core/src/net/socket/mod.rs b/sqlx-core/src/net/socket/mod.rs index 0470abb5ec..c37840dc3b 100644 --- a/sqlx-core/src/net/socket/mod.rs +++ b/sqlx-core/src/net/socket/mod.rs @@ -143,7 +143,7 @@ where pub trait WithSocket { type Output; - fn with_socket(self, socket: S) -> Self::Output; + fn with_socket(self, socket: S) -> impl std::future::Future + Send; } pub struct SocketIntoBox; @@ -151,7 +151,7 @@ pub struct SocketIntoBox; impl WithSocket for SocketIntoBox { type Output = Box; - fn with_socket(self, socket: S) -> Self::Output { + async fn with_socket(self, socket: S) -> Self::Output { Box::new(socket) } } @@ -197,7 +197,7 @@ pub async fn connect_tcp( let stream = TcpStream::connect((host, port)).await?; stream.set_nodelay(true)?; - return Ok(with_socket.with_socket(stream)); + return Ok(with_socket.with_socket(stream).await); } #[cfg(feature = "_rt-async-std")] @@ -217,7 +217,7 @@ pub async fn connect_tcp( Ok(s) }); match stream { - Ok(stream) => return Ok(with_socket.with_socket(stream)), + Ok(stream) => return Ok(with_socket.with_socket(stream).await), Err(e) => last_err = Some(e), } } @@ -255,7 +255,7 @@ pub async fn connect_uds, Ws: WithSocket>( let stream = UnixStream::connect(path).await?; - return Ok(with_socket.with_socket(stream)); + return Ok(with_socket.with_socket(stream).await); } #[cfg(feature = "_rt-async-std")] @@ -265,7 +265,7 @@ pub async fn connect_uds, Ws: WithSocket>( let stream = Async::::connect(path).await?; - Ok(with_socket.with_socket(stream)) + Ok(with_socket.with_socket(stream).await) } #[cfg(not(feature = "_rt-async-std"))] diff --git a/sqlx-core/src/net/tls/mod.rs b/sqlx-core/src/net/tls/mod.rs index b49708b22e..0dfc6a29e6 100644 --- a/sqlx-core/src/net/tls/mod.rs +++ b/sqlx-core/src/net/tls/mod.rs @@ -75,10 +75,10 @@ where Ws: WithSocket, { #[cfg(feature = "_tls-native-tls")] - return Ok(with_socket.with_socket(tls_native_tls::handshake(socket, config).await?)); + return Ok(with_socket.with_socket(tls_native_tls::handshake(socket, config).await?).await); #[cfg(all(feature = "_tls-rustls", not(feature = "_tls-native-tls")))] - return Ok(with_socket.with_socket(tls_rustls::handshake(socket, config).await?)); + return Ok(with_socket.with_socket(tls_rustls::handshake(socket, config).await?).await); #[cfg(not(any(feature = "_tls-native-tls", feature = "_tls-rustls")))] { diff --git a/sqlx-mysql/src/connection/establish.rs b/sqlx-mysql/src/connection/establish.rs index 468478e550..0623a0556c 100644 --- a/sqlx-mysql/src/connection/establish.rs +++ b/sqlx-mysql/src/connection/establish.rs @@ -1,6 +1,5 @@ use bytes::buf::Buf; use bytes::Bytes; -use futures_core::future::BoxFuture; use crate::collation::{CharSet, Collation}; use crate::common::StatementCache; @@ -22,7 +21,7 @@ impl MySqlConnection { None => crate::net::connect_tcp(&options.host, options.port, do_handshake).await?, }; - let stream = handshake.await?; + let stream = handshake?; Ok(Self { inner: Box::new(MySqlConnectionInner { @@ -187,9 +186,9 @@ impl<'a> DoHandshake<'a> { } impl<'a> WithSocket for DoHandshake<'a> { - type Output = BoxFuture<'a, Result>; + type Output = Result; - fn with_socket(self, socket: S) -> Self::Output { - Box::pin(self.do_handshake(socket)) + async fn with_socket(self, socket: S) -> Self::Output { + self.do_handshake(socket).await } } diff --git a/sqlx-mysql/src/connection/tls.rs b/sqlx-mysql/src/connection/tls.rs index 22b3c487b5..eb077c621b 100644 --- a/sqlx-mysql/src/connection/tls.rs +++ b/sqlx-mysql/src/connection/tls.rs @@ -94,7 +94,7 @@ pub(super) async fn maybe_upgrade( impl WithSocket for MapStream { type Output = MySqlStream; - fn with_socket(self, socket: S) -> Self::Output { + async fn with_socket(self, socket: S) -> Self::Output { MySqlStream { socket: BufferedSocket::new(Box::new(socket)), server_version: self.server_version, diff --git a/sqlx-postgres/src/connection/stream.rs b/sqlx-postgres/src/connection/stream.rs index f165899248..79c690c828 100644 --- a/sqlx-postgres/src/connection/stream.rs +++ b/sqlx-postgres/src/connection/stream.rs @@ -47,7 +47,7 @@ impl PgStream { None => net::connect_tcp(&options.host, options.port, MaybeUpgradeTls(options)).await?, }; - let socket = socket_future.await?; + let socket = socket_future?; Ok(Self { inner: BufferedSocket::new(socket), diff --git a/sqlx-postgres/src/connection/tls.rs b/sqlx-postgres/src/connection/tls.rs index 04bab793a7..16b7333bf5 100644 --- a/sqlx-postgres/src/connection/tls.rs +++ b/sqlx-postgres/src/connection/tls.rs @@ -1,5 +1,3 @@ -use futures_core::future::BoxFuture; - use crate::error::Error; use crate::net::tls::{self, TlsConfig}; use crate::net::{Socket, SocketIntoBox, WithSocket}; @@ -10,10 +8,10 @@ use crate::{PgConnectOptions, PgSslMode}; pub struct MaybeUpgradeTls<'a>(pub &'a PgConnectOptions); impl<'a> WithSocket for MaybeUpgradeTls<'a> { - type Output = BoxFuture<'a, crate::Result>>; + type Output = crate::Result>; - fn with_socket(self, socket: S) -> Self::Output { - Box::pin(maybe_upgrade(socket, self.0)) + async fn with_socket(self, socket: S) -> Self::Output { + maybe_upgrade(socket, self.0).await } }