From 9fdd5d0bd053e274a5ae76ab22b32b61c2b80c87 Mon Sep 17 00:00:00 2001
From: Rubens Brandao <git@rubens.io>
Date: Sun, 14 Apr 2024 09:38:13 -0300
Subject: fix metadata impl From lists

---
 rust/src/metadata.rs | 61 ++++++++++++++++++----------------------------------
 1 file changed, 21 insertions(+), 40 deletions(-)

(limited to 'rust/src')

diff --git a/rust/src/metadata.rs b/rust/src/metadata.rs
index e29789e5..e9c83dd5 100644
--- a/rust/src/metadata.rs
+++ b/rust/src/metadata.rs
@@ -441,16 +441,15 @@ impl From<&Array<Metadata>> for Ref<Metadata> {
 
 impl<S: BnStrCompatible> From<HashMap<S, Ref<Metadata>>> for Ref<Metadata> {
     fn from(value: HashMap<S, Ref<Metadata>>) -> Self {
-        let mut key_refs: Vec<S::Result> = vec![];
-        let mut keys: Vec<*const c_char> = vec![];
-        let mut values: Vec<*mut BNMetadata> = vec![];
-        for (k, v) in value.into_iter() {
-            key_refs.push(k.into_bytes_with_nul());
-            values.push(v.as_ref().handle);
-        }
-        for k in &key_refs {
-            keys.push(k.as_ref().as_ptr() as *const c_char);
-        }
+        let data: Vec<(S::Result, Ref<Metadata>)> = value
+            .into_iter()
+            .map(|(k, v)| (k.into_bytes_with_nul(), v))
+            .collect();
+        let mut keys: Vec<*const c_char> = data
+            .iter()
+            .map(|(k, _)| k.as_ref().as_ptr() as *const c_char)
+            .collect();
+        let mut values: Vec<*mut BNMetadata> = data.iter().map(|(_, v)| v.handle).collect();
 
         unsafe {
             Metadata::ref_from_raw(BNCreateMetadataValueStore(
@@ -464,17 +463,15 @@ impl<S: BnStrCompatible> From<HashMap<S, Ref<Metadata>>> for Ref<Metadata> {
 
 impl<S: BnStrCompatible + Copy, T: Into<Ref<Metadata>>> From<&[(S, T)]> for Ref<Metadata> {
     fn from(value: &[(S, T)]) -> Self {
-        let mut key_refs: Vec<S::Result> = vec![];
-        let mut keys: Vec<*const c_char> = vec![];
-        let mut values: Vec<*mut BNMetadata> = vec![];
-        for (k, v) in value.iter() {
-            key_refs.push(k.into_bytes_with_nul());
-            let value_metadata: Ref<Metadata> = v.into();
-            values.push(value_metadata.handle);
-        }
-        for k in &key_refs {
-            keys.push(k.as_ref().as_ptr() as *const c_char);
-        }
+        let data: Vec<(S::Result, Ref<Metadata>)> = value
+            .into_iter()
+            .map(|(k, v)| (k.into_bytes_with_nul(), v.into()))
+            .collect();
+        let mut keys: Vec<*const c_char> = data
+            .iter()
+            .map(|(k, _)| k.as_ref().as_ptr() as *const c_char)
+            .collect();
+        let mut values: Vec<*mut BNMetadata> = data.iter().map(|(_, v)| v.handle).collect();
 
         unsafe {
             Metadata::ref_from_raw(BNCreateMetadataValueStore(
@@ -490,25 +487,9 @@ impl<S: BnStrCompatible + Copy, T: Into<Ref<Metadata>>, const N: usize> From<[(S
     for Ref<Metadata>
 {
     fn from(value: [(S, T); N]) -> Self {
-        let mut key_refs: Vec<S::Result> = vec![];
-        let mut keys: Vec<*const c_char> = vec![];
-        let mut values: Vec<*mut BNMetadata> = vec![];
-        for (k, v) in value.into_iter() {
-            key_refs.push(k.into_bytes_with_nul());
-            let value_metadata: Ref<Metadata> = v.into();
-            values.push(value_metadata.handle);
-        }
-        for k in &key_refs {
-            keys.push(k.as_ref().as_ptr() as *const c_char);
-        }
-
-        unsafe {
-            Metadata::ref_from_raw(BNCreateMetadataValueStore(
-                keys.as_mut_ptr(),
-                values.as_mut_ptr(),
-                keys.len(),
-            ))
-        }
+        let slice = &value[..];
+        // use the `impl From<&[(S, T)]>`
+        slice.into()
     }
 }
 
-- 
cgit v1.3.1