refactor: rename sqlx_core::io::{Encode, Decode} for clarity

Author: abonander

sqlx-core/src/io/decode.rs

@@ -2,27 +2,27 @@ use bytes::Bytes;
 
 use crate::error::Error;
 
-pub trait Decode<'de, Context = ()>
+pub trait ProtocolDecode<'de, Context = ()>
 where
     Self: Sized,
 {
     fn decode(buf: Bytes) -> Result<Self, Error>
     where
-        Self: Decode<'de, ()>,
+        Self: ProtocolDecode<'de, ()>,
     {
         Self::decode_with(buf, ())
     }
 
     fn decode_with(buf: Bytes, context: Context) -> Result<Self, Error>;
 }
 
-impl Decode<'_> for Bytes {
+impl ProtocolDecode<'_> for Bytes {
     fn decode_with(buf: Bytes, _: ()) -> Result<Self, Error> {
         Ok(buf)
     }
 }
 
-impl Decode<'_> for () {
+impl ProtocolDecode<'_> for () {
     fn decode_with(_: Bytes, _: ()) -> Result<(), Error> {
         Ok(())
     }

sqlx-core/src/io/encode.rs

@@ -1,16 +1,17 @@
-pub trait Encode<'en, Context = ()> {
-    fn encode(&self, buf: &mut Vec<u8>)
+pub trait ProtocolEncode<'en, Context = ()> {
+    fn encode(&self, buf: &mut Vec<u8>) -> Result<(), crate::Error>
     where
-        Self: Encode<'en, ()>,
+        Self: ProtocolEncode<'en, ()>,
     {
-        self.encode_with(buf, ());
+        self.encode_with(buf, ())
     }
 
-    fn encode_with(&self, buf: &mut Vec<u8>, context: Context);
+    fn encode_with(&self, buf: &mut Vec<u8>, context: Context) -> Result<(), crate::Error>;
 }
 
-impl<'en, C> Encode<'en, C> for &'_ [u8] {
-    fn encode_with(&self, buf: &mut Vec<u8>, _: C) {
+impl<'en, C> ProtocolEncode<'en, C> for &'_ [u8] {
+    fn encode_with(&self, buf: &mut Vec<u8>, _context: C) -> Result<(), crate::Error> {
         buf.extend_from_slice(self);
+        Ok(())
     }
 }

sqlx-core/src/io/mod.rs

@@ -9,8 +9,8 @@ mod read_buf;
 pub use buf::BufExt;
 pub use buf_mut::BufMutExt;
 //pub use buf_stream::BufStream;
-pub use decode::Decode;
-pub use encode::Encode;
+pub use decode::ProtocolDecode;
+pub use encode::ProtocolEncode;
 pub use read_buf::ReadBuf;
 
 #[cfg(not(feature = "_rt-tokio"))]

sqlx-core/src/net/socket/buffered.rs

@@ -4,7 +4,7 @@ use std::{cmp, io};
 
 use crate::error::Error;
 
-use crate::io::{AsyncRead, AsyncReadExt, Decode, Encode};
+use crate::io::{AsyncRead, AsyncReadExt, ProtocolDecode, ProtocolEncode};
 
 // Tokio, async-std, and std all use this as the default capacity for their buffered I/O.
 const DEFAULT_BUF_SIZE: usize = 8192;
@@ -59,32 +59,36 @@ impl<S: Socket> BufferedSocket<S> {
 
     pub async fn read<'de, T>(&mut self, byte_len: usize) -> Result<T, Error>
     where
-        T: Decode<'de, ()>,
+        T: ProtocolDecode<'de, ()>,
     {
         self.read_with(byte_len, ()).await
     }
 
     pub async fn read_with<'de, T, C>(&mut self, byte_len: usize, context: C) -> Result<T, Error>
     where
-        T: Decode<'de, C>,
+        T: ProtocolDecode<'de, C>,
     {
         T::decode_with(self.read_buffered(byte_len).await?.freeze(), context)
     }
 
-    pub fn write<'en, T>(&mut self, value: T)
+    #[inline(always)]
+    pub fn write<'en, T>(&mut self, value: T) -> Result<(), Error>
     where
-        T: Encode<'en, ()>,
+        T: ProtocolEncode<'en, ()>,
     {
         self.write_with(value, ())
     }
 
-    pub fn write_with<'en, T, C>(&mut self, value: T, context: C)
+    #[inline(always)]
+    pub fn write_with<'en, T, C>(&mut self, value: T, context: C) -> Result<(), Error>
     where
-        T: Encode<'en, C>,
+        T: ProtocolEncode<'en, C>,
     {
-        value.encode_with(self.write_buf.buf_mut(), context);
+        value.encode_with(self.write_buf.buf_mut(), context)?;
         self.write_buf.bytes_written = self.write_buf.buf.len();
         self.write_buf.sanity_check();
+
+        Ok(())
     }
 
     pub async fn flush(&mut self) -> io::Result<()> {