update

geldata · Oct 8, 2024 · afc16ce · afc16ce
1 parent 1163a59
commit afc16ce
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/edb/server/pgrust/src/errors/mod.rs b/edb/server/pgrust/src/errors/mod.rs
@@ -324,7 +324,6 @@ impl PgServerError {
 
     /// Iterate all the fields of this error.
     pub fn fields(&self) -> impl Iterator<Item = (PgServerErrorField, &str)> {
-<<<<<<< HEAD
         PgServerErrorFieldIterator::new(self)
     }
 }
@@ -385,20 +384,6 @@ impl<'a> Iterator for PgServerErrorFieldIterator<'a> {
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next()
-=======
-        let fields = [
-            (PgServerErrorField::Code, self.code.get_error_string()),
-            (PgServerErrorField::Message, self.message.as_str()),
-            (
-                PgServerErrorField::SeverityNonLocalized,
-                self.severity.as_ref(),
-            ),
-        ];
-        Iterator::chain(
-            fields.into_iter(),
-            self.extra.iter().map(|(f, e)| (*f, e.as_str())),
-        )
->>>>>>> 65208d9e1 (Polish)
     }
 }
 

diff --git a/edb/server/pgrust/src/handshake/mod.rs b/edb/server/pgrust/src/handshake/mod.rs
@@ -253,16 +253,13 @@ mod tests {
                 if initial {
                     server_error |= server
                         .drive(
-                            ConnectionDrive::Initial(InitialMessage::new(&msg).unwrap()),
+                            ConnectionDrive::Initial(InitialMessage::new(&msg)),
                             &mut pipe,
                         )
                         .is_err();
                 } else {
                     server_error |= server
-                        .drive(
-                            ConnectionDrive::Message(Message::new(&msg).unwrap()),
-                            &mut pipe,
-                        )
+                        .drive(ConnectionDrive::Message(Message::new(&msg)), &mut pipe)
                         .is_err();
                 }
             }
@@ -272,7 +269,7 @@ mod tests {
                 } else {
                     client_error |= client
                         .drive(
-                            client::ConnectionDrive::Message(Message::new(&msg).unwrap()),
+                            client::ConnectionDrive::Message(Message::new(&msg)),
                             &mut pipe,
                         )
                         .is_err();

diff --git a/edb/server/pgrust/src/protocol/buffer.rs b/edb/server/pgrust/src/protocol/buffer.rs
@@ -39,7 +39,7 @@ impl<M: StructLength> StructBuffer<M> {
             while offset < bytes.len() {
                 if let Some(len) = M::length_of_buf(&bytes[offset..]) {
                     if offset + len <= bytes.len() {
-                        f(M::new(&bytes[offset..offset + len]).unwrap());
+                        f(M::new(&bytes[offset..offset + len]));
                         offset += len;
                     } else {
                         break;
@@ -62,7 +62,7 @@ impl<M: StructLength> StructBuffer<M> {
         while let Some(len) = M::length_of_buf(&contiguous[total_processed..]) {
             if total_processed + len <= contiguous.len() {
                 let message_bytes = &contiguous[total_processed..total_processed + len];
-                f(M::new(message_bytes).unwrap());
+                f(M::new(message_bytes));
                 total_processed += len;
             } else {
                 break;
@@ -103,7 +103,7 @@ impl<M: StructLength> StructBuffer<M> {
             while offset < bytes.len() {
                 if let Some(len) = M::length_of_buf(&bytes[offset..]) {
                     if offset + len <= bytes.len() {
-                        f(M::new(&bytes[offset..offset + len]).unwrap())?;
+                        f(M::new(&bytes[offset..offset + len]))?;
                         offset += len;
                     } else {
                         break;
@@ -126,7 +126,7 @@ impl<M: StructLength> StructBuffer<M> {
         while let Some(len) = M::length_of_buf(&contiguous[total_processed..]) {
             if total_processed + len <= contiguous.len() {
                 let message_bytes = &contiguous[total_processed..total_processed + len];
-                f(M::new(message_bytes).unwrap())?;
+                f(M::new(message_bytes))?;
                 total_processed += len;
             } else {
                 break;

diff --git a/edb/server/pgrust/src/protocol/datatypes.rs b/edb/server/pgrust/src/protocol/datatypes.rs
@@ -506,11 +506,11 @@ macro_rules! basic_types {
                     (out[i], buf) = if let Some((bytes, rest)) = buf.split_first_chunk() {
                         (<$ty>::from_be_bytes(*bytes), rest)
                     } else {
-                        return Err($crate::protocol::ParseError::TooShort)
+                        panic!()
                     };
                     i += 1;
                 }
-                Ok(out)
+                out
             }
         }
 

diff --git a/edb/server/pgrust/src/protocol/message_group.rs b/edb/server/pgrust/src/protocol/message_group.rs
@@ -77,7 +77,7 @@ pub(crate) use message_group;
 /// use pgrust::protocol::messages::*;
 ///
 /// let buf = [b'?', 0, 0, 0, 4];
-/// match_message!(Message::new(&buf).unwrap(), Backend {
+/// match_message!(Message::new(&buf), Backend {
 ///     (BackendKeyData as data) => {
 ///         todo!();
 ///     },