Merge pull request #3 from ndrluis/upgrade-rustler

Bump up rustler version to v0.35.1

Author: maartenvanvliet

Diff for: native/sqlparser_parse/Cargo.lock

@@ -10,5 +10,5 @@ path = "src/lib.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-rustler = "0.26.0"
-sqlparser = "0.30.0"
+rustler = "0.35.1"
+sqlparser = "0.30.0"

Diff for: native/sqlparser_parse/Cargo.toml

@@ -1,6 +1,5 @@
 use rustler::types::atom::Atom;
-use rustler::{Decoder, Encoder, Env, Term};
-use rustler::{NifResult, NifStruct, NifTaggedEnum, NifUntaggedEnum};
+use rustler::{NifStruct, NifTaggedEnum, NifUntaggedEnum};
 // use rustler::{map}
 mod type_atoms {
     rustler::atoms! {
@@ -162,7 +161,7 @@ impl From<Expr> for sqlparser::ast::Expr {
             )),
             ExprEnum::UnaryOp(op) => sqlparser::ast::Expr::UnaryOp {
                 expr: Box::new(sqlparser::ast::Expr::from(*op.expr.clone())),
-                op: sqlparser::ast::UnaryOperator::from(op.op)
+                op: sqlparser::ast::UnaryOperator::from(op.op),
             },
             ExprEnum::SimilarTo(..)
             | ExprEnum::Nested(..)
@@ -175,10 +174,12 @@ impl From<Expr> for sqlparser::ast::Expr {
             | ExprEnum::InList(..)
             | ExprEnum::AllOp(..)
             | ExprEnum::AnyOp(..)
-            | ExprEnum::CompositeAccess(..) => sqlparser::ast::Expr::Identifier(sqlparser::ast::Ident {
-                value: "abd".to_string(),
-                quote_style: None,
-            }),
+            | ExprEnum::CompositeAccess(..) => {
+                sqlparser::ast::Expr::Identifier(sqlparser::ast::Ident {
+                    value: "abd".to_string(),
+                    quote_style: None,
+                })
+            }
         }
     }
 }
@@ -245,7 +246,7 @@ impl From<TableFactor> for sqlparser::ast::TableFactor {
 impl From<JoinOperator> for sqlparser::ast::JoinOperator {
     fn from(join_operator: JoinOperator) -> Self {
         match join_operator {
-            _ => sqlparser::ast::JoinOperator::CrossJoin
+            _ => sqlparser::ast::JoinOperator::CrossJoin,
         }
     }
 }
@@ -261,7 +262,11 @@ impl From<TableWithJoins> for sqlparser::ast::TableWithJoins {
     fn from(table_with_joins: TableWithJoins) -> Self {
         sqlparser::ast::TableWithJoins {
             relation: sqlparser::ast::TableFactor::from(table_with_joins.relation),
-            joins: table_with_joins.joins.iter().map(|j| sqlparser::ast::Join::from(j.clone())).collect(),
+            joins: table_with_joins
+                .joins
+                .iter()
+                .map(|j| sqlparser::ast::Join::from(j.clone()))
+                .collect(),
         }
     }
 }
@@ -416,17 +421,6 @@ pub enum SetExpr {
     // Insert(Statement),
     NotImplemented(Atom),
 }
-impl Encoder for Box<SetExpr> {
-    fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
-        let data = &**self;
-        data.encode(env)
-    }
-}
-impl Decoder<'_> for Box<SetExpr> {
-    fn decode<'a>(_term: Term<'a>) -> NifResult<Self> {
-        Err(rustler::error::Error::BadArg)
-    }
-}
 
 #[derive(NifStruct)]
 #[module = "SqlParser.Wildcard"]
@@ -979,21 +973,6 @@ pub struct Expr {
     value: ExprEnum,
 }
 
-impl Encoder for Box<Expr> {
-    fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
-        let data = &**self;
-        data.encode(env)
-    }
-}
-impl Decoder<'_> for Box<Expr> {
-    fn decode<'a>(term: Term<'a>) -> NifResult<Self> {
-        let expr: Expr = term.decode()?;
-        println!("{:#?}", term);
-        // println!("{:#?}", expr);
-        // Err(rustler::error::Error::BadArg)
-        Ok(Box::new(expr))
-    }
-}
 impl Expr {
     pub fn new(ast: sqlparser::ast::Expr) -> Self {
         match ast {
@@ -1321,17 +1300,6 @@ pub enum OffsetRows {
     Rows,
 }
 
-impl Encoder for Box<Query> {
-    fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
-        let data = &**self;
-        data.encode(env)
-    }
-}
-impl Decoder<'_> for Box<Query> {
-    fn decode<'a>(_term: Term<'a>) -> NifResult<Self> {
-        Err(rustler::error::Error::BadArg)
-    }
-}
 impl From<sqlparser::ast::SetExpr> for SetExpr {
     fn from(set_expr: sqlparser::ast::SetExpr) -> Self {
         match set_expr {

Diff for: native/sqlparser_parse/src/datatypes.rs

@@ -72,4 +72,4 @@ fn to_sql(ast: Document, _dialect: Dialect) -> Result<(Atom, String), Error> {
     return Ok((atom::ok(), statement.to_string()));
 }
 
-rustler::init!("Elixir.SqlParser.Parse", [parse_statements, to_sql]);
+rustler::init!("Elixir.SqlParser.Parse");