Cleanups

Author: penberg

src/lib.rs

@@ -809,26 +809,15 @@ impl RowsIterator {
         let safe_ints = self.safe_ints;
         let raw = self.raw;
         let pluck = self.pluck;
-        let rows = self.rows.clone();
-        let mut rows = rows.lock().await;
-        let next_row = rows.next().await.map_err(Error::from)?;
-        let record = match next_row {
-            Some(row) => Record {
-                column_names,
-                row: Some(row),
-                safe_ints,
-                raw,
-                pluck,
-            },
-            None => Record {
-                column_names,
-                row: None,
-                safe_ints,
-                raw,
-                pluck,
-            },
-        };
-        Ok(record)
+        let mut rows = self.rows.lock().await;
+        let row = rows.next().await.map_err(Error::from)?;
+        Ok(Record {
+            row,
+            column_names,
+            safe_ints,
+            raw,
+            pluck,
+        })
     }
 }
 
@@ -840,8 +829,8 @@ pub fn iterator_next_sync(iter: &RowsIterator) -> Result<Record> {
 
 #[napi]
 pub struct Record {
-    column_names: Vec<std::ffi::CString>,
     row: Option<libsql::Row>,
+    column_names: Vec<std::ffi::CString>,
     safe_ints: bool,
     raw: bool,
     pluck: bool,