fix table_util.rs

rbatis · May 31, 2024 · b9ca4a3 · b9ca4a3
1 parent 0bc8522
commit b9ca4a3
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/utils/table_util.rs b/src/utils/table_util.rs
@@ -244,8 +244,8 @@ macro_rules! make_table_field_map_btree {
     ($vec_ref:expr,$($field_name:ident$(.)?)+) => {{
         let mut ids = std::collections::BTreeMap::new();
         for item in $vec_ref {
-             match &item $(.$field_name)+ {
-                std::option::Option::Some(ref v) => {
+            match item.$($field_name.)+as_ref() {
+                std::option::Option::Some(v) => {
                     ids.insert(v.clone(), item.clone());
                 }
                 _ => {}
@@ -260,11 +260,10 @@ macro_rules! make_table_field_map_btree {
 #[macro_export]
 macro_rules! make_table_field_map {
     ($vec_ref:expr,$($field_name:ident$(.)?)+) => {{
-        let vec = $vec_ref;
-        let mut ids = std::collections::HashMap::with_capacity(vec.len());
-        for item in vec {
-              match item $(.$field_name)+ {
-                std::option::Option::Some(ref v) => {
+        let mut ids = std::collections::HashMap::with_capacity($vec_ref.len());
+        for item in $vec_ref {
+            match item.$($field_name.)+as_ref() {
+                std::option::Option::Some(v) => {
                     ids.insert(v.clone(), item.clone());
                 }
                 _ => {}
@@ -281,7 +280,7 @@ macro_rules! make_table_field_vec {
     ($vec_ref:expr,$($field_name:ident$(.)?)+) => {{
         let mut ids = std::vec::Vec::with_capacity($vec_ref.len());
         for item in $vec_ref {
-            match &item $(.$field_name)+ {
+            match item.$($field_name.)+as_ref() {
                 std::option::Option::Some(v) => {
                     ids.push(v.clone());
                 }