chore: Update for Rust 1.72.0

Cargo.toml

@@ -15,6 +15,7 @@ members = [
   "dozer-log-python",
   "dozer-utils"
 ]
+resolver = "2"
 
 [patch.crates-io]
 postgres = { git = "https://github.com/getdozer/rust-postgres" }

dozer-api/Cargo.toml

@@ -32,7 +32,7 @@ tonic-web = "0.4.0"
 jsonwebtoken = "8.3.0"
 tokio-stream = "0.1.12"
 crossbeam = "0.8.2"
-async-trait = "0.1.66"
+async-trait = "0.1.73"
 tracing-actix-web = "0.7.2"
 tower = "0.4.13"
 hyper = "0.14.24"

dozer-ingestion/src/connectors/grpc/ingest.rs

@@ -78,10 +78,11 @@ where
                 if let Ok(req) = result {
                     let Some(table_index) = table_names
                         .iter()
-                        .position(|table| table.name == req.schema_name) else {
-                            error!("schema name not found: {}", req.schema_name);
-                            break;
-                        };
+                        .position(|table| table.name == req.schema_name)
+                    else {
+                        error!("schema name not found: {}", req.schema_name);
+                        break;
+                    };
 
                     seq_no = req.seq_no;
                     let res = adapter.handle_message(
@@ -142,10 +143,11 @@ where
                 if let Ok(req) = result {
                     let Some(table_index) = table_names
                         .iter()
-                        .position(|table| table.name == req.schema_name) else {
-                            error!("schema name not found: {}", req.schema_name);
-                            break;
-                        };
+                        .position(|table| table.name == req.schema_name)
+                    else {
+                        error!("schema name not found: {}", req.schema_name);
+                        break;
+                    };
 
                     seq_no = req.seq_no;
                     let res = adapter.handle_message(

dozer-ingestion/tests/test_suite/basic.rs

@@ -165,7 +165,7 @@ pub async fn run_test_suite_basic_insert_only<T: InsertOnlyConnectorTest>() {
             }
 
             // Filter out non-operation events.
-            let IngestionMessageKind::OperationEvent{ op: operation, .. } = message.kind else {
+            let IngestionMessageKind::OperationEvent { op: operation, .. } = message.kind else {
                 continue;
             };
 
@@ -244,7 +244,7 @@ pub async fn run_test_suite_basic_cud<T: CudConnectorTest>() {
         }
 
         // Filter out non-operation events.
-        let IngestionMessageKind::OperationEvent{ op: operation, .. } = message.kind else {
+        let IngestionMessageKind::OperationEvent { op: operation, .. } = message.kind else {
             continue;
         };
 

dozer-sql/src/pipeline/expression/comparison.rs

@@ -1698,7 +1698,23 @@ pub fn evaluate_gt(
     }
 }
 
-define_comparison!(evaluate_eq, "=", |l, r| { l == r });
-define_comparison!(evaluate_ne, "!=", |l, r| { l != r });
-define_comparison!(evaluate_lte, "<=", |l, r| { l <= r });
-define_comparison!(evaluate_gte, ">=", |l, r| { l >= r });
+fn eq<T: PartialEq>(left: T, right: T) -> bool {
+    left == right
+}
+
+fn ne<T: PartialEq>(left: T, right: T) -> bool {
+    left != right
+}
+
+fn le<T: PartialOrd>(left: T, right: T) -> bool {
+    left <= right
+}
+
+fn ge<T: PartialOrd>(left: T, right: T) -> bool {
+    left >= right
+}
+
+define_comparison!(evaluate_eq, "=", eq);
+define_comparison!(evaluate_ne, "!=", ne);
+define_comparison!(evaluate_lte, "<=", le);
+define_comparison!(evaluate_gte, ">=", ge);

dozer-sql/src/pipeline/expression/mathematical.rs

@@ -1777,11 +1777,11 @@ macro_rules! define_math_operator {
     };
 }
 
-define_math_operator!(evaluate_add, "+", |a, b| { a + b }, 0);
-define_math_operator!(evaluate_sub, "-", |a, b| { a - b }, 0);
-define_math_operator!(evaluate_mul, "*", |a, b| { a * b }, 0);
-define_math_operator!(evaluate_div, "/", |a, b| { a / b }, 1);
-define_math_operator!(evaluate_mod, "%", |a, b| { a % b }, 0);
+define_math_operator!(evaluate_add, "+", std::ops::Add::add, 0);
+define_math_operator!(evaluate_sub, "-", std::ops::Sub::sub, 0);
+define_math_operator!(evaluate_mul, "*", std::ops::Mul::mul, 0);
+define_math_operator!(evaluate_div, "/", std::ops::Div::div, 1);
+define_math_operator!(evaluate_mod, "%", std::ops::Rem::rem, 0);
 
 pub fn evaluate_plus(
     schema: &Schema,

dozer-storage/src/lmdb_map.rs

@@ -18,11 +18,7 @@ pub struct LmdbMap<K, V> {
 
 impl<K, V> Clone for LmdbMap<K, V> {
     fn clone(&self) -> Self {
-        Self {
-            db: self.db,
-            _key: std::marker::PhantomData,
-            _value: std::marker::PhantomData,
-        }
+        *self
     }
 }
 

dozer-storage/src/lmdb_multimap.rs

@@ -20,11 +20,7 @@ pub struct LmdbMultimap<K, V> {
 
 impl<K, V> Clone for LmdbMultimap<K, V> {
     fn clone(&self) -> Self {
-        Self {
-            db: self.db,
-            _key: std::marker::PhantomData,
-            _value: std::marker::PhantomData,
-        }
+        *self
     }
 }
 

dozer-storage/src/lmdb_option.rs

@@ -12,7 +12,7 @@ pub struct LmdbOption<V>(LmdbMap<u8, V>);
 
 impl<V> Clone for LmdbOption<V> {
     fn clone(&self) -> Self {
-        Self(self.0)
+        *self
     }
 }
 

dozer-storage/src/lmdb_set.rs

@@ -11,7 +11,7 @@ pub struct LmdbSet<K>(LmdbMap<K, Vec<u8>>);
 
 impl<K> Clone for LmdbSet<K> {
     fn clone(&self) -> Self {
-        Self(self.0)
+        *self
     }
 }