From b681ec93352bbc1a315e36923a1a59ab3f319cb5 Mon Sep 17 00:00:00 2001 From: Remi Dettai Date: Tue, 1 Apr 2025 09:33:33 +0200 Subject: [PATCH 1/2] Fix compilation stability --- src/fastfield/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index dc63acfde..6db5ec6d9 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -942,7 +942,7 @@ mod tests { let numbers = [100, 200, 300]; let test_range = |range: RangeInclusive| { - let expected_count = numbers.iter().filter(|num| range.contains(num)).count(); + let expected_count = numbers.iter().filter(|num| range.contains(*num)).count(); let mut vec = vec![]; field.get_row_ids_for_value_range(range, 0..u32::MAX, &mut vec); assert_eq!(vec.len(), expected_count); @@ -1020,7 +1020,7 @@ mod tests { let numbers = [1000, 1001, 1003]; let test_range = |range: RangeInclusive| { - let expected_count = numbers.iter().filter(|num| range.contains(num)).count(); + let expected_count = numbers.iter().filter(|num| range.contains(*num)).count(); let mut vec = vec![]; field.get_row_ids_for_value_range(range, 0..u32::MAX, &mut vec); assert_eq!(vec.len(), expected_count); From 06d2dcf469b7eec029e55abbcc3cc443a336c892 Mon Sep 17 00:00:00 2001 From: Remi Dettai Date: Tue, 1 Apr 2025 09:52:22 +0200 Subject: [PATCH 2/2] Further fix type inference tests --- columnar/src/block_accessor.rs | 2 +- columnar/src/columnar/merge/tests.rs | 8 ++++---- stacker/src/expull.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/columnar/src/block_accessor.rs b/columnar/src/block_accessor.rs index b04d640f0..6f47a97eb 100644 --- a/columnar/src/block_accessor.rs +++ b/columnar/src/block_accessor.rs @@ -139,7 +139,7 @@ mod tests { missing_docs.push(missing_doc); }); - assert_eq!(missing_docs, vec![]); + assert_eq!(missing_docs, Vec::::new()); } #[test] diff --git a/columnar/src/columnar/merge/tests.rs b/columnar/src/columnar/merge/tests.rs index 1eea5e9ef..206d5da5f 100644 --- a/columnar/src/columnar/merge/tests.rs +++ b/columnar/src/columnar/merge/tests.rs @@ -403,11 +403,11 @@ fn test_merge_columnar_different_types() { panic!() }; assert_eq!(vals.get_cardinality(), Cardinality::Optional); - assert_eq!(vals.values_for_doc(0).collect_vec(), vec![]); - assert_eq!(vals.values_for_doc(1).collect_vec(), vec![]); - assert_eq!(vals.values_for_doc(2).collect_vec(), vec![]); + assert_eq!(vals.values_for_doc(0).collect_vec(), Vec::::new()); + assert_eq!(vals.values_for_doc(1).collect_vec(), Vec::::new()); + assert_eq!(vals.values_for_doc(2).collect_vec(), Vec::::new()); assert_eq!(vals.values_for_doc(3).collect_vec(), vec![1]); - assert_eq!(vals.values_for_doc(4).collect_vec(), vec![]); + assert_eq!(vals.values_for_doc(4).collect_vec(), Vec::::new()); // text column let dynamic_column = cols[1].open().unwrap(); diff --git a/stacker/src/expull.rs b/stacker/src/expull.rs index 58128d680..5fd00db3d 100644 --- a/stacker/src/expull.rs +++ b/stacker/src/expull.rs @@ -160,7 +160,7 @@ mod tests { { let mut buffer = Vec::new(); stack.read_to_end(&arena, &mut buffer); - assert_eq!(&buffer[..], &[]); + assert_eq!(&buffer[..], &[] as &[u8]); } }