result: simplify create_cass_rows_from_rows

This function unnecessarily accepted and returned an Option.
It should be the caller's responsibility to call this function
only if `result.rows` is Some.

Author: muzarski

scylla-rust-wrapper/src/query_result.rs

@@ -1431,7 +1431,7 @@ mod tests {
         ));
 
         let rows = create_cass_rows_from_rows(
-            Some(vec![Row {
+            vec![Row {
                 columns: vec![
                     Some(CqlValue::BigInt(42)),
                     None,
@@ -1441,11 +1441,14 @@ mod tests {
                         CqlValue::Float(9999.9999),
                     ])),
                 ],
-            }]),
+            }],
             &metadata,
         );
 
-        CassResult { rows, metadata }
+        CassResult {
+            rows: Some(rows),
+            metadata,
+        }
     }
 
     unsafe fn cass_result_column_name_rust_str(

scylla-rust-wrapper/src/session.rs

@@ -357,7 +357,9 @@ pub unsafe extern "C" fn cass_session_execute(
                     maybe_col_data_types,
                     result.tracing_id,
                 ));
-                let cass_rows = create_cass_rows_from_rows(result.rows, &metadata);
+                let cass_rows = result
+                    .rows
+                    .map(|rows| create_cass_rows_from_rows(rows, &metadata));
                 let cass_result = Arc::new(CassResult {
                     rows: cass_rows,
                     metadata,
@@ -378,10 +380,9 @@ pub unsafe extern "C" fn cass_session_execute(
 }
 
 pub(crate) fn create_cass_rows_from_rows(
-    rows: Option<Vec<Row>>,
+    rows: Vec<Row>,
     metadata: &Arc<CassResultData>,
-) -> Option<Vec<CassRow>> {
-    let rows = rows?;
+) -> Vec<CassRow> {
     let cass_rows = rows
         .into_iter()
         .map(|r| CassRow {
@@ -390,7 +391,7 @@ pub(crate) fn create_cass_rows_from_rows(
         })
         .collect();
 
-    Some(cass_rows)
+    cass_rows
 }
 
 fn create_cass_row_columns(row: Row, metadata: &Arc<CassResultData>) -> Vec<CassValue> {