use asserts rather than awkward error checks.

Author: jeff-davis

tokio-postgres/src/replication_client.rs

@@ -10,7 +10,6 @@ use pin_project_lite::pin_project;
 use postgres_protocol::escape::{escape_identifier, escape_literal};
 use postgres_protocol::message::backend::{Message, ReplicationMessage};
 use postgres_protocol::message::frontend;
-use std::io;
 use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::str::from_utf8;
@@ -76,18 +75,12 @@ impl ReplicationClient {
         let fields = rowdesc.fields().collect::<Vec<_>>().map_err(Error::parse)?;
         let ranges = datarow.ranges().collect::<Vec<_>>().map_err(Error::parse)?;
 
-        if fields.len() != 4
-            || fields[0].type_oid() != Type::TEXT.oid()
-            || fields[1].type_oid() != Type::INT4.oid()
-            || fields[2].type_oid() != Type::TEXT.oid()
-            || fields[3].type_oid() != Type::TEXT.oid()
-            || ranges.len() != 4
-        {
-            return Err(Error::parse(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "expected (text, int4, text, text) result",
-            )));
-        };
+        assert_eq!(fields.len(), 4);
+        assert_eq!(fields[0].type_oid(), Type::TEXT.oid());
+        assert_eq!(fields[1].type_oid(), Type::INT4.oid());
+        assert_eq!(fields[2].type_oid(), Type::TEXT.oid());
+        assert_eq!(fields[3].type_oid(), Type::TEXT.oid());
+        assert_eq!(ranges.len(), 4);
 
         let values: Vec<Option<&str>> = ranges
             .iter()
@@ -133,12 +126,9 @@ impl ReplicationClient {
         let fields = rowdesc.fields().collect::<Vec<_>>().map_err(Error::parse)?;
         let ranges = datarow.ranges().collect::<Vec<_>>().map_err(Error::parse)?;
 
-        if fields.len() != 1 || fields[0].type_oid() != Type::TEXT.oid() || ranges.len() != 1 {
-            return Err(Error::parse(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "expected single text column in response",
-            )));
-        };
+        assert_eq!(fields.len(), 1);
+        assert_eq!(fields[0].type_oid(), Type::TEXT.oid());
+        assert_eq!(ranges.len(), 1);
 
         let val = from_utf8(&datarow.buffer()[ranges[0].to_owned().unwrap()]).unwrap();