Cleanup & format

partiql-eval/src/plan.rs

@@ -1,9 +1,8 @@
 use itertools::{Either, Itertools};
-use ordered_float::OrderedFloat;
 use partiql_logical as logical;
 use partiql_logical::{
     AggFunc, BagOperator, BinaryOp, BindingsOp, CallName, GroupingStrategy, IsTypeExpr, JoinKind,
-    Lit, LogicalPlan, OpId, PathComponent, Pattern, PatternMatchExpr, SearchedCase, SetQuantifier,
+    LogicalPlan, OpId, PathComponent, Pattern, PatternMatchExpr, SearchedCase, SetQuantifier,
     SortSpecNullOrder, SortSpecOrder, Type, UnaryOp, ValueExpr, VarRefType,
 };
 use petgraph::prelude::StableGraph;
@@ -25,8 +24,8 @@ use crate::eval::expr::{
 };
 use crate::eval::EvalPlan;
 use partiql_catalog::catalog::{Catalog, FunctionEntryFunction};
+use partiql_value::Value;
 use partiql_value::Value::Null;
-use partiql_value::{Bag, List, Tuple, Value};
 
 #[macro_export]
 macro_rules! correct_num_args_or_err {
@@ -787,7 +786,6 @@ mod tests {
     use partiql_catalog::catalog::PartiqlCatalog;
     use partiql_logical::CallExpr;
     use partiql_logical::ExprQuery;
-    use partiql_value::Value;
 
     #[test]
     fn test_logical_to_eval_plan_bad_num_arguments() {

partiql-logical-planner/src/builtins.rs

@@ -2,7 +2,6 @@ use itertools::Itertools;
 use once_cell::sync::Lazy;
 use partiql_logical as logical;
 use partiql_logical::{SetQuantifier, ValueExpr};
-use partiql_value::Value;
 use std::collections::HashMap;
 use std::fmt::Debug;
 
@@ -241,7 +240,7 @@ fn function_call_def_trim() -> CallDef {
                 output: Box::new(|mut args| {
                     args.insert(
                         0,
-                        ValueExpr::Lit(Box::new(logical::Lit::String(" ".to_string().into()))),
+                        ValueExpr::Lit(Box::new(logical::Lit::String(" ".to_string()))),
                     );
 
                     logical::ValueExpr::Call(logical::CallExpr {
@@ -255,7 +254,7 @@ fn function_call_def_trim() -> CallDef {
                 output: Box::new(|mut args| {
                     args.insert(
                         0,
-                        ValueExpr::Lit(Box::new(logical::Lit::String(" ".to_string().into()))),
+                        ValueExpr::Lit(Box::new(logical::Lit::String(" ".to_string()))),
                     );
                     logical::ValueExpr::Call(logical::CallExpr {
                         name: logical::CallName::BTrim,

partiql-logical-planner/src/lower.rs

@@ -21,7 +21,7 @@ use partiql_logical::{
 };
 use std::borrow::Cow;
 
-use partiql_value::{BindingsName, Value};
+use partiql_value::BindingsName;
 
 use std::collections::{HashMap, HashSet};
 

partiql-logical-planner/src/typer.rs

@@ -8,7 +8,7 @@ use partiql_types::{
     type_string, type_struct, type_undefined, ArrayType, BagType, PartiqlShape,
     PartiqlShapeBuilder, ShapeResultError, Static, StructConstraint, StructField, StructType,
 };
-use partiql_value::{BindingsName, Value};
+use partiql_value::BindingsName;
 use petgraph::algo::toposort;
 use petgraph::graph::NodeIndex;
 use petgraph::prelude::StableGraph;

partiql-logical/src/lib.rs

@@ -56,7 +56,7 @@ use partiql_common::catalog::ObjectId;
 /// assert_eq!(3, p.operators().len());
 /// assert_eq!(2, p.flows().len());
 /// ```
-use partiql_value::{BindingsName, Value};
+use partiql_value::BindingsName;
 use rust_decimal::Decimal as RustDecimal;
 use std::collections::HashMap;
 use std::fmt::{Debug, Display, Formatter};

partiql-logical/src/util.rs

@@ -11,7 +11,7 @@ impl From<Value> for Lit {
             Value::Missing => Lit::Missing,
             Value::Boolean(b) => Lit::Bool(b),
             Value::Integer(n) => Lit::Int64(n),
-            Value::Real(f) => Lit::Double(f.into()),
+            Value::Real(f) => Lit::Double(f),
             Value::Decimal(d) => Lit::Decimal(*d),
             Value::String(s) => Lit::String(*s),
             Value::Blob(bytes) => {
@@ -53,18 +53,18 @@ impl From<Lit> for Value {
             Lit::Int8(n) => Value::Integer(n.into()),
             Lit::Int16(n) => Value::Integer(n.into()),
             Lit::Int32(n) => Value::Integer(n.into()),
-            Lit::Int64(n) => Value::Integer(n.into()),
+            Lit::Int64(n) => Value::Integer(n),
             Lit::Decimal(d) => Value::Decimal(d.into()),
-            Lit::Double(f) => Value::Real(f.into()),
+            Lit::Double(f) => Value::Real(f),
             Lit::Bool(b) => Value::Boolean(b),
             Lit::String(s) => Value::String(s.into()),
             Lit::BoxDocument(contents, typ) => {
                 parse_embedded_ion_str(&String::from_utf8_lossy(contents.as_slice()))
                     .expect("TODO ion parsing error")
             }
-            Lit::Struct(strct) => Value::from(Tuple::from(Tuple::from_iter(
+            Lit::Struct(strct) => Value::from(Tuple::from_iter(
                 strct.into_iter().map(|(k, v)| (k, Value::from(v))),
-            ))),
+            )),
             Lit::Bag(bag) => Value::from(Bag::from_iter(bag.into_iter().map(Value::from))),
             Lit::List(list) => Value::from(List::from_iter(list.into_iter().map(Value::from))),
         }

partiql-parser/src/parse/parse_util.rs

@@ -3,7 +3,7 @@ use partiql_ast::ast;
 use crate::parse::parser_state::ParserState;
 use crate::ParseError;
 use bitflags::bitflags;
-use partiql_ast::ast::{AstNode, Expr, Lit, LitField};
+use partiql_ast::ast::{Expr, Lit};
 use partiql_common::node::NodeIdGenerator;
 use partiql_common::syntax::location::{ByteOffset, BytePosition};