minimize line change count

kernel/tests/read.rs

@@ -231,11 +231,14 @@ async fn remove_action() -> Result<(), Box<dyn std::error::Error>> {
     let snapshot = table.snapshot(&engine, None)?;
     let scan = snapshot.into_scan_builder().build()?;
 
-    let stream = scan.execute(&engine)?.zip(expected_data);
+    let stream = scan
+        .execute(&engine)?
+        .map(Result::unwrap)
+        .zip(expected_data);
 
     let mut files = 0;
     for (data, expected) in stream {
-        let raw_data = data?.raw_data?;
+        let raw_data = data.raw_data?;
         files += 1;
         assert_eq!(into_record_batch(raw_data), expected);
     }
@@ -464,10 +467,10 @@ fn read_with_scan_data(
 ) -> Result<(), Box<dyn std::error::Error>> {
     let global_state = scan.global_scan_state();
     let result_schema: ArrowSchemaRef = Arc::new(scan.schema().as_ref().try_into()?);
-    let scan_data = scan.scan_data(engine)?.map(Result::unwrap);
+    let scan_data = scan.scan_data(engine)?;
     let mut scan_files = vec![];
     for data in scan_data {
-        let (data, vec) = data;
+        let (data, vec) = data?;
         scan_files = visit_scan_files(data.as_ref(), &vec, scan_files, scan_data_callback)?;
     }