changes required after rebase on main

Author: sdd

crates/iceberg/src/arrow/caching_delete_file_loader.rs

@@ -20,7 +20,7 @@ use std::collections::HashMap;
 use futures::channel::oneshot;
 use futures::future::join_all;
 use futures::{StreamExt, TryStreamExt};
-use tokio::sync::oneshot::{channel, Receiver};
+use tokio::sync::oneshot::{Receiver, channel};
 
 use super::delete_filter::{DeleteFilter, EqDelFuture};
 use crate::arrow::delete_file_loader::BasicDeleteFileLoader;
@@ -91,9 +91,9 @@ impl CachingDeleteFileLoader {
     ///  * The unbound Predicates resulting from equality deletes are sent to their associated oneshot
     ///      channel to store them in the right place in the delete file managers state.
     ///  * The results of all of these futures are awaited on in parallel with the specified
-    ///      level of concurrency and collected into a vec. We then combine all the delete
-    ///      vector maps that resulted from any positional delete or delete vector files into a
-    ///      single map and persist it in the state.
+    ///    level of concurrency and collected into a vec. We then combine all the delete
+    ///    vector maps that resulted from any positional delete or delete vector files into a
+    ///    single map and persist it in the state.
     ///
     ///
     ///  Conceptually, the data flow is like this:

crates/iceberg/src/arrow/delete_file_loader.rs

@@ -19,8 +19,8 @@ use std::sync::Arc;
 
 use futures::{StreamExt, TryStreamExt};
 
-use crate::arrow::record_batch_transformer::RecordBatchTransformer;
 use crate::arrow::ArrowReader;
+use crate::arrow::record_batch_transformer::RecordBatchTransformer;
 use crate::io::FileIO;
 use crate::scan::{ArrowRecordBatchStream, FileScanTaskDeleteFile};
 use crate::spec::{Schema, SchemaRef};

crates/iceberg/src/delete_vector.rs

@@ -17,9 +17,9 @@
 
 use std::ops::BitOrAssign;
 
+use roaring::RoaringTreemap;
 use roaring::bitmap::Iter;
 use roaring::treemap::BitmapIter;
-use roaring::RoaringTreemap;
 
 #[derive(Debug, Default)]
 pub struct DeleteVector {
@@ -63,7 +63,7 @@ impl Iterator for DeleteVectorIterator<'_> {
     type Item = u64;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if let Some(ref mut inner) = &mut self.inner {
+        if let Some(inner) = &mut self.inner {
             if let Some(inner_next) = inner.bitmap_iter.next() {
                 return Some(u64::from(inner.high_bits) << 32 | u64::from(inner_next));
             }