diff --git a/vegafusion-common/src/data/scalar.rs b/vegafusion-common/src/data/scalar.rs index 03daa018..3a13621c 100644 --- a/vegafusion-common/src/data/scalar.rs +++ b/vegafusion-common/src/data/scalar.rs @@ -4,7 +4,6 @@ use datafusion_common::DataFusionError; use datafusion_common::utils::array_into_list_array; pub use datafusion_common::ScalarValue; -use datafusion_expr::col; #[cfg(feature = "json")] use { diff --git a/vegafusion-dataframe/src/dataframe.rs b/vegafusion-dataframe/src/dataframe.rs index 6d051966..94bf86f8 100644 --- a/vegafusion-dataframe/src/dataframe.rs +++ b/vegafusion-dataframe/src/dataframe.rs @@ -4,10 +4,7 @@ use arrow::datatypes::{Schema, SchemaRef}; use arrow::record_batch::RecordBatch; use async_trait::async_trait; use datafusion_common::{DFSchema, ScalarValue}; -use datafusion_expr::{ - expr, BuiltInWindowFunction, Expr, WindowFrame, WindowFrameBound, WindowFrameUnits, - WindowFunctionDefinition, -}; +use datafusion_expr::{expr, BuiltInWindowFunction, Expr, WindowFrame, WindowFunctionDefinition}; use std::any::Any; use std::fmt::{Display, Formatter}; use std::sync::Arc; diff --git a/vegafusion-runtime/src/transform/collect.rs b/vegafusion-runtime/src/transform/collect.rs index ed43f06e..8e067a09 100644 --- a/vegafusion-runtime/src/transform/collect.rs +++ b/vegafusion-runtime/src/transform/collect.rs @@ -8,8 +8,7 @@ use vegafusion_core::error::{Result, ResultWithContext}; use vegafusion_core::proto::gen::transforms::{Collect, SortOrder}; use async_trait::async_trait; -use datafusion_common::scalar::ScalarValue; -use datafusion_expr::{BuiltInWindowFunction, WindowFrame, WindowFrameBound, WindowFrameUnits}; +use datafusion_expr::{BuiltInWindowFunction, WindowFrame}; use vegafusion_common::column::{flat_col, unescaped_col}; use vegafusion_common::data::ORDER_COL; use vegafusion_core::task_graph::task_value::TaskValue; diff --git a/vegafusion-runtime/src/transform/identifier.rs b/vegafusion-runtime/src/transform/identifier.rs index 30b356a5..1398f1e7 100644 --- a/vegafusion-runtime/src/transform/identifier.rs +++ b/vegafusion-runtime/src/transform/identifier.rs @@ -2,13 +2,9 @@ use crate::expression::compiler::config::CompilationConfig; use crate::transform::TransformTrait; use async_trait::async_trait; -use datafusion_expr::{ - expr, BuiltInWindowFunction, Expr, WindowFrame, WindowFrameBound, WindowFrameUnits, - WindowFunctionDefinition, -}; +use datafusion_expr::{expr, BuiltInWindowFunction, Expr, WindowFrame, WindowFunctionDefinition}; use std::sync::Arc; use vegafusion_common::column::flat_col; -use vegafusion_common::data::scalar::ScalarValue; use vegafusion_common::data::ORDER_COL; use vegafusion_common::error::Result; use vegafusion_core::proto::gen::transforms::Identifier; diff --git a/vegafusion-runtime/src/transform/window.rs b/vegafusion-runtime/src/transform/window.rs index f44bff5b..05fc57a0 100644 --- a/vegafusion-runtime/src/transform/window.rs +++ b/vegafusion-runtime/src/transform/window.rs @@ -11,7 +11,7 @@ use vegafusion_core::proto::gen::transforms::{ }; use vegafusion_core::task_graph::task_value::TaskValue; -use datafusion_expr::{window_frame, BuiltInWindowFunction, WindowFrameBound, WindowFrameUnits}; +use datafusion_expr::{BuiltInWindowFunction, WindowFrameBound, WindowFrameUnits}; use vegafusion_common::column::{flat_col, unescaped_col}; use vegafusion_common::data::ORDER_COL; use vegafusion_common::datatypes::to_numeric; diff --git a/vegafusion-sql/src/dataframe/mod.rs b/vegafusion-sql/src/dataframe/mod.rs index e52cf69c..ea0d6083 100644 --- a/vegafusion-sql/src/dataframe/mod.rs +++ b/vegafusion-sql/src/dataframe/mod.rs @@ -11,7 +11,7 @@ use datafusion_expr::expr::AggregateFunctionDefinition; use datafusion_expr::{ abs, expr, is_null, lit, max, min, when, AggregateFunction, BuiltInWindowFunction, BuiltinScalarFunction, Expr, ExprSchemable, ScalarFunctionDefinition, WindowFrame, - WindowFrameBound, WindowFrameUnits, WindowFunctionDefinition, + WindowFunctionDefinition, }; use sqlparser::ast::{ Cte, Expr as SqlExpr, GroupByExpr, Ident, Query, Select, SelectItem, SetExpr, Statement,