From 562ea39ee3b67465fc8debe5784d02bcfe3ed690 Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Thu, 18 Feb 2021 23:50:36 -0800 Subject: [PATCH] fix: resolve new future-incompatible lint, trailing ; on macros --- sqlx-core/src/io/buf_stream.rs | 12 ++++++------ sqlx-mysql/src/connection/connect.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sqlx-core/src/io/buf_stream.rs b/sqlx-core/src/io/buf_stream.rs index 554adbed..f52a456f 100644 --- a/sqlx-core/src/io/buf_stream.rs +++ b/sqlx-core/src/io/buf_stream.rs @@ -108,19 +108,19 @@ macro_rules! read { }}; (@blocking @flush $self:ident) => { - $self.flush()?; + $self.flush()? }; (@flush $self:ident) => { - $self.flush_async().await?; + $self.flush_async().await? }; (@blocking @read $self:ident, $b:ident) => { - $self.stream.read($b)?; + $self.stream.read($b)? }; (@read $self:ident, $b:ident) => { - $self.stream.read_async($b).await?; + $self.stream.read_async($b).await? }; } @@ -147,11 +147,11 @@ macro_rules! flush { }}; (@blocking @write $self:ident, $b:expr) => { - $self.stream.write($b)?; + $self.stream.write($b)? }; (@write $self:ident, $b:expr) => { - $self.stream.write_async($b).await?; + $self.stream.write_async($b).await? }; } diff --git a/sqlx-mysql/src/connection/connect.rs b/sqlx-mysql/src/connection/connect.rs index a0b7e967..6411a29f 100644 --- a/sqlx-mysql/src/connection/connect.rs +++ b/sqlx-mysql/src/connection/connect.rs @@ -103,11 +103,11 @@ impl MySqlConnection { macro_rules! impl_connect { (@blocking @new $options:ident) => { - NetStream::connect($options.address.as_ref())?; + NetStream::connect($options.address.as_ref())? }; (@new $options:ident) => { - NetStream::connect_async($options.address.as_ref()).await?; + NetStream::connect_async($options.address.as_ref()).await? }; ($(@$blocking:ident)? $options:ident) => {{