diff --git a/vortex-expr/src/between.rs b/vortex-expr/src/exprs/between.rs similarity index 100% rename from vortex-expr/src/between.rs rename to vortex-expr/src/exprs/between.rs diff --git a/vortex-expr/src/binary.rs b/vortex-expr/src/exprs/binary.rs similarity index 100% rename from vortex-expr/src/binary.rs rename to vortex-expr/src/exprs/binary.rs diff --git a/vortex-expr/src/cast.rs b/vortex-expr/src/exprs/cast.rs similarity index 100% rename from vortex-expr/src/cast.rs rename to vortex-expr/src/exprs/cast.rs diff --git a/vortex-expr/src/get_item.rs b/vortex-expr/src/exprs/get_item.rs similarity index 100% rename from vortex-expr/src/get_item.rs rename to vortex-expr/src/exprs/get_item.rs diff --git a/vortex-expr/src/is_null.rs b/vortex-expr/src/exprs/is_null.rs similarity index 100% rename from vortex-expr/src/is_null.rs rename to vortex-expr/src/exprs/is_null.rs diff --git a/vortex-expr/src/let_.rs b/vortex-expr/src/exprs/let_.rs similarity index 100% rename from vortex-expr/src/let_.rs rename to vortex-expr/src/exprs/let_.rs diff --git a/vortex-expr/src/like.rs b/vortex-expr/src/exprs/like.rs similarity index 100% rename from vortex-expr/src/like.rs rename to vortex-expr/src/exprs/like.rs diff --git a/vortex-expr/src/list_contains.rs b/vortex-expr/src/exprs/list_contains.rs similarity index 100% rename from vortex-expr/src/list_contains.rs rename to vortex-expr/src/exprs/list_contains.rs diff --git a/vortex-expr/src/literal.rs b/vortex-expr/src/exprs/literal.rs similarity index 100% rename from vortex-expr/src/literal.rs rename to vortex-expr/src/exprs/literal.rs diff --git a/vortex-expr/src/merge.rs b/vortex-expr/src/exprs/merge.rs similarity index 100% rename from vortex-expr/src/merge.rs rename to vortex-expr/src/exprs/merge.rs diff --git a/vortex-expr/src/exprs/mod.rs b/vortex-expr/src/exprs/mod.rs new file mode 100644 index 00000000000..26d5b565d21 --- /dev/null +++ b/vortex-expr/src/exprs/mod.rs @@ -0,0 +1,15 @@ +pub mod between; +pub mod binary; +pub mod cast; +pub mod get_item; +pub mod is_null; +pub mod let_; +pub mod like; +pub mod list_contains; +pub mod literal; +pub mod merge; +pub mod not; +pub mod operators; +pub mod pack; +pub mod select; +pub mod var; diff --git a/vortex-expr/src/not.rs b/vortex-expr/src/exprs/not.rs similarity index 100% rename from vortex-expr/src/not.rs rename to vortex-expr/src/exprs/not.rs diff --git a/vortex-expr/src/operators.rs b/vortex-expr/src/exprs/operators.rs similarity index 100% rename from vortex-expr/src/operators.rs rename to vortex-expr/src/exprs/operators.rs diff --git a/vortex-expr/src/pack.rs b/vortex-expr/src/exprs/pack.rs similarity index 100% rename from vortex-expr/src/pack.rs rename to vortex-expr/src/exprs/pack.rs diff --git a/vortex-expr/src/select.rs b/vortex-expr/src/exprs/select.rs similarity index 100% rename from vortex-expr/src/select.rs rename to vortex-expr/src/exprs/select.rs diff --git a/vortex-expr/src/var.rs b/vortex-expr/src/exprs/var.rs similarity index 100% rename from vortex-expr/src/var.rs rename to vortex-expr/src/exprs/var.rs diff --git a/vortex-expr/src/lib.rs b/vortex-expr/src/lib.rs index 0b732970aed..1ae1f58af74 100644 --- a/vortex-expr/src/lib.rs +++ b/vortex-expr/src/lib.rs @@ -4,34 +4,19 @@ use std::hash::Hash; use std::sync::Arc; use dyn_hash::DynHash; - -mod binary; - +pub use exprs::*; mod analysis; #[cfg(feature = "arbitrary")] pub mod arbitrary; -mod between; -mod cast; +mod exprs; mod field; pub mod forms; -mod get_item; -mod is_null; -mod let_; -mod like; -mod list_contains; -mod literal; -mod merge; -mod not; -mod operators; -mod pack; pub mod pruning; #[cfg(feature = "proto")] mod registry; mod scope; -mod select; pub mod transform; pub mod traversal; -mod var; pub use analysis::*; pub use between::*;