From f69086f72c64aee6799d49e7ffcf4f134053ac03 Mon Sep 17 00:00:00 2001 From: Kanthi Subramanian Date: Tue, 6 Oct 2026 17:33:30 +0200 Subject: [PATCH 1/2] Fix clippy lint error --- ffi/src/table_changes.rs | 2 +- kernel/src/actions/visitors.rs | 2 +- kernel/src/engine/parquet_row_group_skipping.rs | 1 + kernel/src/schema/mod.rs | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ffi/src/table_changes.rs b/ffi/src/table_changes.rs index 1358961e16..7dad60dbae 100644 --- a/ffi/src/table_changes.rs +++ b/ffi/src/table_changes.rs @@ -22,7 +22,7 @@ use crate::expressions::kernel_visitor::{unwrap_kernel_predicate, KernelExpressi use crate::scan::EnginePredicate; use crate::{ catch_unwind_into_extern_result, kernel_string_slice, unwrap_and_parse_path_as_url, - AllocateStringFn, ExternEngine, ExternResult, IntoExternResult, KernelStringSlice, + AllocateStringFn, ExternEngine, ExternResult, KernelStringSlice, NullableCvoid, SharedExternEngine, SharedSchema, }; diff --git a/kernel/src/actions/visitors.rs b/kernel/src/actions/visitors.rs index 370a796a54..3334d3148e 100644 --- a/kernel/src/actions/visitors.rs +++ b/kernel/src/actions/visitors.rs @@ -826,7 +826,7 @@ mod tests { }; let expected = vec![add1, add2, add3]; assert_eq!(add_visitor.adds.len(), expected.len()); - for (add, expected) in add_visitor.adds.into_iter().zip(expected.into_iter()) { + for (add, expected) in add_visitor.adds.into_iter().zip(expected) { assert_eq!(add, expected); } } diff --git a/kernel/src/engine/parquet_row_group_skipping.rs b/kernel/src/engine/parquet_row_group_skipping.rs index bdef0e13f2..5d885d8b39 100644 --- a/kernel/src/engine/parquet_row_group_skipping.rs +++ b/kernel/src/engine/parquet_row_group_skipping.rs @@ -208,6 +208,7 @@ impl ParquetStatsProvider for RowGroupFilter<'_> { // physical name mapping has been performed. Because we currently lack both the // validation and the name mapping support, we must disable this optimization for the // time being. See https://github.com/delta-io/delta-kernel-rs/issues/434. + #[allow(unknown_lints, clippy::some_filter)] return Some(self.get_parquet_rowcount_stat()).filter(|_| false); }; diff --git a/kernel/src/schema/mod.rs b/kernel/src/schema/mod.rs index 5095420498..4d0d737dbe 100644 --- a/kernel/src/schema/mod.rs +++ b/kernel/src/schema/mod.rs @@ -1110,6 +1110,7 @@ impl ColumnNamesAndTypes { (&self.0, &self.1) } + #[allow(dead_code)] pub(crate) fn extend(&mut self, other: ColumnNamesAndTypes) { self.0.extend(other.0); self.1.extend(other.1); From 65d8dac184fb2ac06706a8af0a571a6c3e7e79b1 Mon Sep 17 00:00:00 2001 From: Kanthi Subramanian Date: Tue, 6 Oct 2026 18:32:39 +0200 Subject: [PATCH 2/2] Fix formatting (cargo fmt) --- ffi/src/lib.rs | 13 ++++++++++--- ffi/src/scan.rs | 1 - ffi/src/table_changes.rs | 4 ++-- kernel/src/scan/mod.rs | 5 ++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index 872df04487..2d43dea25a 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -522,7 +522,11 @@ pub unsafe extern "C" fn builder_build( let allocate_fn = builder_box.allocate_fn; unsafe { catch_unwind_into_extern_result(&allocate_fn, move || { - get_default_engine_impl(builder_box.url, builder_box.options, builder_box.allocate_fn) + get_default_engine_impl( + builder_box.url, + builder_box.options, + builder_box.allocate_fn, + ) }) } } @@ -555,8 +559,11 @@ unsafe fn catch_unwind_into_extern_result( alloc: &dyn AllocateError, f: impl FnOnce() -> DeltaResult, ) -> ExternResult { - let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(f)) - .unwrap_or_else(|_| Err(Error::generic("delta-kernel-rs panicked across the FFI boundary"))); + let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(f)).unwrap_or_else(|_| { + Err(Error::generic( + "delta-kernel-rs panicked across the FFI boundary", + )) + }); unsafe { result.into_extern_result(alloc) } } diff --git a/ffi/src/scan.rs b/ffi/src/scan.rs index ba5c50bb03..64f9e06b9c 100644 --- a/ffi/src/scan.rs +++ b/ffi/src/scan.rs @@ -624,5 +624,4 @@ mod tests { let final_map: HashMap = *unsafe { Box::from_raw(map_ptr) }; assert_eq!(test_map, final_map); } - } diff --git a/ffi/src/table_changes.rs b/ffi/src/table_changes.rs index 7dad60dbae..858d1390f0 100644 --- a/ffi/src/table_changes.rs +++ b/ffi/src/table_changes.rs @@ -22,8 +22,8 @@ use crate::expressions::kernel_visitor::{unwrap_kernel_predicate, KernelExpressi use crate::scan::EnginePredicate; use crate::{ catch_unwind_into_extern_result, kernel_string_slice, unwrap_and_parse_path_as_url, - AllocateStringFn, ExternEngine, ExternResult, KernelStringSlice, - NullableCvoid, SharedExternEngine, SharedSchema, + AllocateStringFn, ExternEngine, ExternResult, KernelStringSlice, NullableCvoid, + SharedExternEngine, SharedSchema, }; #[handle_descriptor(target=TableChanges, mutable=true, sized=true)] diff --git a/kernel/src/scan/mod.rs b/kernel/src/scan/mod.rs index 81b0dbd95d..259044e760 100644 --- a/kernel/src/scan/mod.rs +++ b/kernel/src/scan/mod.rs @@ -589,7 +589,10 @@ impl Scan { &self, engine: Arc, ) -> DeltaResult>>> { - fn scan_metadata_callback(batches: &mut Vec, file: state::ScanFile) -> bool { + fn scan_metadata_callback( + batches: &mut Vec, + file: state::ScanFile, + ) -> bool { batches.push(file); true }