diff --git a/sqlx-postgres-protocol/src/describe.rs b/sqlx-postgres-protocol/src/describe.rs index afc25cd02..bf6540637 100644 --- a/sqlx-postgres-protocol/src/describe.rs +++ b/sqlx-postgres-protocol/src/describe.rs @@ -25,7 +25,7 @@ impl<'a> Encode for Describe<'a> { let len = 4 + self.name.len() + 1 + 4; buf.extend_from_slice(&(len as i32).to_be_bytes()); - + match &self.kind { DescribeKind::Portal => buf.push(b'P'), DescribeKind::PreparedStatement => buf.push(b'S'), @@ -61,4 +61,4 @@ mod test { Ok(()) } -} \ No newline at end of file +} diff --git a/sqlx-postgres-protocol/src/message.rs b/sqlx-postgres-protocol/src/message.rs index 2895c74b9..23e423249 100644 --- a/sqlx-postgres-protocol/src/message.rs +++ b/sqlx-postgres-protocol/src/message.rs @@ -1,6 +1,6 @@ use crate::{ Authentication, BackendKeyData, CommandComplete, DataRow, Decode, NotificationResponse, - ParameterStatus, ReadyForQuery, Response, RowDescription, ParameterDescription, + ParameterDescription, ParameterStatus, ReadyForQuery, Response, RowDescription, }; use byteorder::{BigEndian, ByteOrder}; use bytes::BytesMut; diff --git a/sqlx-postgres-protocol/src/parameter_description.rs b/sqlx-postgres-protocol/src/parameter_description.rs index 086da0159..ab94d9848 100644 --- a/sqlx-postgres-protocol/src/parameter_description.rs +++ b/sqlx-postgres-protocol/src/parameter_description.rs @@ -1,4 +1,4 @@ -use crate::{Decode}; +use crate::Decode; use byteorder::{BigEndian, ByteOrder}; use bytes::Bytes; @@ -14,17 +14,17 @@ pub struct ParameterDescription { impl Decode for ParameterDescription { fn decode(src: Bytes) -> io::Result { let count = BigEndian::read_u16(&*src) as usize; - + // todo: error handling assert_eq!(src.len(), count * 4 + 2); - + let mut ids = Vec::with_capacity(count); for i in 0..count { let offset = i * 4 + 2; // 4==size_of(u32), 2==size_of(u16) ids.push(BigEndian::read_u32(&src[offset..])); } - Ok(ParameterDescription {ids}) + Ok(ParameterDescription { ids }) } } @@ -61,4 +61,4 @@ mod test { let src = Bytes::from_static(b"\x00\x00\x00\x01\x02\x03"); ParameterDescription::decode(src).unwrap(); } -} \ No newline at end of file +} diff --git a/sqlx-postgres/src/connection/prepare.rs b/sqlx-postgres/src/connection/prepare.rs index ebd5b1490..336e682be 100644 --- a/sqlx-postgres/src/connection/prepare.rs +++ b/sqlx-postgres/src/connection/prepare.rs @@ -16,7 +16,11 @@ pub fn prepare<'a, 'b>(connection: &'a mut Connection, query: &'b str) -> Prepar let bind_state = proto::bind::header(&mut connection.wbuf, "", "", &[]); - Prepare { connection, bind_state, bind_values: 0 } + Prepare { + connection, + bind_state, + bind_values: 0, + } } impl<'a> Prepare<'a> { @@ -36,7 +40,12 @@ impl<'a> Prepare<'a> { #[inline] pub async fn execute(self) -> io::Result { - proto::bind::trailer(&mut self.connection.wbuf, self.bind_state, self.bind_values, &[]); + proto::bind::trailer( + &mut self.connection.wbuf, + self.bind_state, + self.bind_values, + &[], + ); self.connection.send(Execute::new("", 0)); self.connection.send(Sync);