chore[array]: use macro for trait def

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

encodings/alp/src/alp/compress.rs

@@ -269,15 +269,15 @@ mod tests {
 
     #[test]
     fn test_nullable_compress() {
-        let array = PrimitiveArray::from_option_iter([None, Some(1.234f32), None]);
+        let array = PrimitiveArray::from_iter([None, Some(1.234f32), None]);
         let encoded = alp_encode(&array, None).unwrap();
         assert!(encoded.patches().is_none());
-        let expected_encoded = PrimitiveArray::from_option_iter([None, Some(1234i32), None]);
+        let expected_encoded = PrimitiveArray::from_iter([None, Some(1234i32), None]);
         assert_arrays_eq!(encoded.encoded(), expected_encoded);
         assert_eq!(encoded.exponents(), Exponents { e: 9, f: 6 });
 
         let decoded = decompress(encoded);
-        let expected = PrimitiveArray::from_option_iter(vec![None, Some(1.234f32), None]);
+        let expected = PrimitiveArray::from_iter(vec![None, Some(1.234f32), None]);
         assert_arrays_eq!(decoded, expected);
     }
 
@@ -305,7 +305,7 @@ mod tests {
         let encoded = alp_encode(&array, None).unwrap();
         assert!(encoded.patches().is_none());
         let expected_encoded =
-            PrimitiveArray::from_option_iter(buffer![Some(1234i64), Some(2718), None, Some(4000)]);
+            PrimitiveArray::from_iter(buffer![Some(1234i64), Some(2718), None, Some(4000)]);
         assert_arrays_eq!(encoded.encoded(), expected_encoded);
         assert_eq!(encoded.exponents(), Exponents { e: 16, f: 13 });
 
@@ -316,13 +316,8 @@ mod tests {
     #[test]
     #[allow(clippy::approx_constant)] // ALP doesn't like E
     fn test_nullable_patched_scalar_at() {
-        let array = PrimitiveArray::from_option_iter([
-            Some(1.234f64),
-            Some(2.718),
-            Some(PI),
-            Some(4.0),
-            None,
-        ]);
+        let array =
+            PrimitiveArray::from_iter([Some(1.234f64), Some(2.718), Some(PI), Some(4.0), None]);
         let encoded = alp_encode(&array, None).unwrap();
         assert!(encoded.patches().is_some());
 
@@ -540,7 +535,7 @@ mod tests {
             .map(|i| if i % 3 == 0 { None } else { Some(2.5f32) })
             .collect::<Vec<_>>();
 
-        let original = PrimitiveArray::from_option_iter(values);
+        let original = PrimitiveArray::from_iter(values);
         let encoded = alp_encode(&original, None).unwrap();
 
         let sliced_alp = encoded.slice(512..1024);
@@ -631,7 +626,7 @@ mod tests {
             })
             .collect();
 
-        let array = PrimitiveArray::from_option_iter(values);
+        let array = PrimitiveArray::from_iter(values);
         let encoded = alp_encode(&array, None).unwrap();
         let decoded = decompress(encoded);
 

encodings/alp/src/alp/compute/cast.rs

@@ -104,7 +104,7 @@ mod tests {
     #[rstest]
     #[case(buffer![1.23f32, 4.56, 7.89, 10.11, 12.13].into_array())]
     #[case(buffer![100.1f64, 200.2, 300.3, 400.4, 500.5].into_array())]
-    #[case(PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
+    #[case(PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
     #[case(buffer![42.42f64].into_array())]
     #[case(buffer![0.0f32, -1.5, 2.5, -3.5, 4.5].into_array())]
     fn test_cast_alp_conformance(#[case] array: vortex_array::ArrayRef) {

encodings/alp/src/alp/compute/filter.rs

@@ -44,7 +44,7 @@ mod test {
     #[rstest]
     #[case(buffer![1.23f32, 4.56, 7.89, 10.11, 12.13].into_array())]
     #[case(buffer![100.1f64, 200.2, 300.3, 400.4, 500.5].into_array())]
-    #[case(PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
+    #[case(PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
     #[case(buffer![42.42f64].into_array())]
     #[case(buffer![
         1.0f32, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0,

encodings/alp/src/alp/compute/mask.rs

@@ -43,7 +43,7 @@ mod test {
     #[rstest]
     #[case(buffer![10.5f32, 20.5, 30.5, 40.5, 50.5].into_array())]
     #[case(buffer![1000.123f64, 2000.456, 3000.789, 4000.012, 5000.345].into_array())]
-    #[case(PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
+    #[case(PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
     #[case(buffer![99.99f64].into_array())]
     #[case(buffer![
         0.1f32, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,

encodings/alp/src/alp/compute/mod.rs

@@ -24,8 +24,8 @@ mod tests {
     #[case::f32_array(alp_encode(&PrimitiveArray::from_iter([1.23f32, 4.56, 7.89, 10.11, 12.13]), None).unwrap())]
     #[case::f64_array(alp_encode(&PrimitiveArray::from_iter([100.1f64, 200.2, 300.3, 400.4, 500.5]), None).unwrap())]
     // Nullable arrays
-    #[case::nullable_f32(alp_encode(&PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]), None).unwrap())]
-    #[case::nullable_f64(alp_encode(&PrimitiveArray::from_option_iter([Some(1.1f64), None, Some(2.2), Some(3.3), None]), None).unwrap())]
+    #[case::nullable_f32(alp_encode(&PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]), None).unwrap())]
+    #[case::nullable_f64(alp_encode(&PrimitiveArray::from_iter([Some(1.1f64), None, Some(2.2), Some(3.3), None]), None).unwrap())]
     // Edge cases
     #[case::single_element(alp_encode(&PrimitiveArray::from_iter([42.42f64]), None).unwrap())]
     // Large arrays

encodings/alp/src/alp/compute/take.rs

@@ -42,7 +42,7 @@ mod test {
     #[rstest]
     #[case(buffer![1.23f32, 4.56, 7.89, 10.11, 12.13].into_array())]
     #[case(buffer![100.1f64, 200.2, 300.3, 400.4, 500.5].into_array())]
-    #[case(PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
+    #[case(PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]).into_array())]
     #[case(buffer![42.42f64].into_array())]
     fn test_take_alp_conformance(#[case] array: vortex_array::ArrayRef) {
         let alp = ALPEncoding

encodings/alp/src/alp_rd/array.rs

@@ -285,7 +285,7 @@ mod test {
         reals[900] = None;
 
         // Create a new array from this.
-        let real_array = PrimitiveArray::from_option_iter(reals.iter().cloned());
+        let real_array = PrimitiveArray::from_iter(reals.iter().cloned());
 
         // Pick a seed that we know will trigger lots of patches.
         let encoder: alp_rd::RDEncoder = alp_rd::RDEncoder::new(&[seed.powi(-2)]);
@@ -294,6 +294,6 @@ mod test {
 
         let decoded = rd_array.to_primitive();
 
-        assert_arrays_eq!(decoded, PrimitiveArray::from_option_iter(reals));
+        assert_arrays_eq!(decoded, PrimitiveArray::from_iter(reals));
     }
 }

encodings/alp/src/alp_rd/compute/cast.rs

@@ -82,8 +82,7 @@ mod tests {
 
     #[test]
     fn test_cast_alprd_nullable() {
-        let arr =
-            PrimitiveArray::from_option_iter([Some(10.0f64), None, Some(10.1), Some(10.2), None]);
+        let arr = PrimitiveArray::from_iter([Some(10.0f64), None, Some(10.1), Some(10.2), None]);
         let values = vec![10.0f64, 10.1, 10.2];
         let encoder = RDEncoder::new(&values);
         let alprd = encoder.encode(&arr);
@@ -133,7 +132,7 @@ mod tests {
         encoder.encode(&arr)
     })]
     #[case::nullable({
-        let arr = PrimitiveArray::from_option_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]);
+        let arr = PrimitiveArray::from_iter([Some(1.1f32), None, Some(2.2), Some(3.3), None]);
         let values = vec![1.1f32, 2.2, 3.3];
         let encoder = RDEncoder::new(&values);
         encoder.encode(&arr)

encodings/alp/src/alp_rd/compute/filter.rs

@@ -77,7 +77,7 @@ mod test {
     fn test_filter_with_nulls<T: ALPRDFloat>(#[case] a: T, #[case] outlier: T) {
         test_filter_conformance(
             &RDEncoder::new(&[a])
-                .encode(&PrimitiveArray::from_option_iter([
+                .encode(&PrimitiveArray::from_iter([
                     Some(a),
                     None,
                     Some(outlier),

encodings/alp/src/alp_rd/compute/mask.rs

@@ -50,7 +50,7 @@ mod tests {
     fn test_mask_with_nulls<T: ALPRDFloat>(#[case] a: T, #[case] outlier: T) {
         test_mask_conformance(
             &RDEncoder::new(&[a])
-                .encode(&PrimitiveArray::from_option_iter([
+                .encode(&PrimitiveArray::from_iter([
                     Some(a),
                     None,
                     Some(outlier),