fixup

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

Author: joseph-isaacs

encodings/fastlanes/benches/pipeline_bitpacking_compare_scalar.rs

@@ -9,11 +9,11 @@ use mimalloc::MiMalloc;
 use rand::prelude::StdRng;
 use rand::{Rng, SeedableRng};
 use vortex_array::compute::{filter, warm_up_vtables};
+use vortex_array::expr::{lit, lt, root};
 use vortex_array::{Array, ArrayRef, IntoArray, ToCanonical};
 use vortex_buffer::{BitBuffer, BufferMut};
 use vortex_dtype::NativePType;
 use vortex_error::VortexResult;
-use vortex_expr::{lit, lt, root};
 use vortex_fastlanes::FoRArray;
 use vortex_fastlanes::bitpack_compress::bitpack_to_best_bit_width;
 use vortex_mask::Mask;

fuzz/fuzz_targets/file_io.rs

@@ -8,11 +8,11 @@ use itertools::Itertools;
 use libfuzzer_sys::{Corpus, fuzz_target};
 use vortex_array::arrays::ChunkedArray;
 use vortex_array::compute::{Operator, compare, filter};
+use vortex_array::expr::{lit, root};
 use vortex_array::{Array, Canonical, IntoArray, ToCanonical};
 use vortex_buffer::ByteBufferMut;
 use vortex_dtype::{DType, StructFields};
 use vortex_error::{VortexExpect, VortexUnwrap, vortex_panic};
-use vortex_expr::{lit, root};
 use vortex_file::{OpenOptionsSessionExt, WriteOptionsSessionExt, WriteStrategyBuilder};
 use vortex_fuzz::{CompressorStrategy, FuzzFileAction, RUNTIME, SESSION};
 use vortex_layout::layouts::compact::CompactCompressor;

vortex-array/src/expr/exprs/cast.rs

@@ -136,12 +136,11 @@ mod tests {
     use vortex_error::VortexUnwrap as _;
 
     use super::cast;
+    use crate::IntoArray;
     use crate::arrays::StructArray;
     use crate::expr::exprs::get_item::get_item;
     use crate::expr::exprs::root::root;
-    use crate::expr::Expression;
-    use crate::expr::test_harness;
-    use crate::IntoArray;
+    use crate::expr::{Expression, test_harness};
 
     #[test]
     fn dtype() {

vortex-array/src/expr/exprs/is_null.rs

@@ -99,8 +99,10 @@ mod tests {
     use vortex_error::VortexUnwrap as _;
     use vortex_scalar::Scalar;
     use vortex_utils::aliases::hash_map::HashMap;
+    use vortex_utils::aliases::hash_set::HashSet;
 
     use super::is_null;
+    use crate::IntoArray;
     use crate::arrays::{PrimitiveArray, StructArray};
     use crate::expr::exprs::binary::eq;
     use crate::expr::exprs::get_item::{col, get_item};
@@ -109,8 +111,6 @@ mod tests {
     use crate::expr::pruning::checked_pruning_expr;
     use crate::expr::test_harness;
     use crate::stats::Stat;
-    use crate::IntoArray;
-    use vortex_utils::aliases::hash_set::HashSet;
 
     #[test]
     fn dtype() {

vortex-array/src/expr/exprs/list_contains.rs

@@ -142,11 +142,14 @@ impl ExpressionView<'_, ListContains> {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
     use vortex_buffer::BitBuffer;
     use vortex_dtype::PType::I32;
     use vortex_dtype::{DType, Field, FieldPath, FieldPathSet, Nullability, StructFields};
     use vortex_scalar::Scalar;
     use vortex_utils::aliases::hash_map::HashMap;
+    use vortex_utils::aliases::hash_set::HashSet;
 
     use super::list_contains;
     use crate::arrays::{BoolArray, ListArray, PrimitiveArray};
@@ -158,8 +161,6 @@ mod tests {
     use crate::stats::Stat;
     use crate::validity::Validity;
     use crate::{Array, ArrayRef, IntoArray};
-    use std::sync::Arc;
-    use vortex_utils::aliases::hash_set::HashSet;
 
     fn test_array() -> ArrayRef {
         ListArray::try_new(

vortex-array/src/expr/exprs/merge.rs

@@ -194,10 +194,10 @@ mod tests {
 
     use super::merge;
     use crate::arrays::{PrimitiveArray, StructArray};
+    use crate::expr::Expression;
     use crate::expr::exprs::get_item::get_item;
     use crate::expr::exprs::merge::{DuplicateHandling, merge_opts};
     use crate::expr::exprs::root::root;
-    use crate::expr::Expression;
     use crate::{Array, IntoArray, ToCanonical};
 
     fn primitive_field(array: &dyn Array, field_path: &[&str]) -> VortexResult<PrimitiveArray> {

vortex-array/src/expr/exprs/not.rs

@@ -85,11 +85,11 @@ mod tests {
     use vortex_dtype::{DType, Nullability};
 
     use super::not;
+    use crate::ToCanonical;
     use crate::arrays::BoolArray;
     use crate::expr::exprs::get_item::{col, get_item};
     use crate::expr::exprs::root::root;
     use crate::expr::test_harness;
-    use crate::ToCanonical;
 
     #[test]
     fn invert_booleans() {

vortex-array/src/expr/exprs/pack.rs

@@ -181,10 +181,10 @@ mod tests {
 
     use super::{Pack, PackOptions, pack};
     use crate::arrays::{PrimitiveArray, StructArray};
+    use crate::expr::VTableExt;
     use crate::expr::exprs::get_item::col;
     use crate::validity::Validity;
     use crate::vtable::ValidityHelper;
-    use crate::expr::VTableExt;
     use crate::{Array, ArrayRef, IntoArray, ToCanonical};
 
     fn test_array() -> ArrayRef {

vortex-array/src/expr/pruning/pruning_expr.rs

@@ -107,6 +107,7 @@ mod tests {
     use vortex_dtype::{
         DType, FieldName, FieldNames, FieldPath, FieldPathSet, Nullability, StructFields,
     };
+    use vortex_utils::aliases::hash_set::HashSet;
 
     use super::HashMap;
     use crate::compute::{BetweenOptions, StrictComparison};
@@ -118,7 +119,6 @@ mod tests {
     use crate::expr::exprs::root::root;
     use crate::expr::pruning::{checked_pruning_expr, field_path_stat_field_name};
     use crate::stats::Stat;
-    use vortex_utils::aliases::hash_set::HashSet;
 
     // Implement some checked pruning expressions.
     #[fixture]

vortex-file/src/file.rs

@@ -11,11 +11,11 @@ use std::sync::Arc;
 
 use itertools::Itertools;
 use vortex_array::ArrayRef;
+use vortex_array::expr::Expression;
+use vortex_array::expr::pruning::checked_pruning_expr;
 use vortex_array::stats::StatsSet;
 use vortex_dtype::{DType, Field, FieldMask, FieldPath, FieldPathSet};
 use vortex_error::VortexResult;
-use vortex_expr::Expression;
-use vortex_expr::pruning::checked_pruning_expr;
 use vortex_layout::LayoutReader;
 use vortex_layout::segments::SegmentSource;
 use vortex_metrics::VortexMetrics;