Make it easier to integrate sequential_map downstream

Author: ivmarkov

rs-matter/src/persist.rs

@@ -62,21 +62,23 @@ pub trait KvBlobStore {
     /// # Arguments
     /// - `key` - the key of the BLOB
     /// - `data` - the data to store
+    /// - `buf` - a buffer that the `KvBlobStore` implementation might use for its own purposes
     ///
     /// # Returns
     /// - `Ok(())` if the BLOB was successfully stored,
     /// - `Err` if an error occurred during storing.
-    async fn store(&mut self, key: u16, data: &[u8]) -> Result<(), Error>;
+    async fn store(&mut self, key: u16, data: &[u8], buf: &mut [u8]) -> Result<(), Error>;
 
     /// Remove a BLOB with the specified key from the storage.
     ///
     /// # Arguments
     /// - `key` - the key of the BLOB
+    /// - `buf` - a buffer that the `KvBlobStore` implementation might use for its own purposes
     ///
     /// # Returns
     /// - `Ok(())` if the BLOB was successfully removed or did not exist
     /// - `Err` if an error occurred during removing.
-    async fn remove(&mut self, key: u16) -> Result<(), Error>;
+    async fn remove(&mut self, key: u16, buf: &mut [u8]) -> Result<(), Error>;
 }
 
 impl<T> KvBlobStore for &mut T
@@ -87,12 +89,12 @@ where
         T::load(self, key, buf).await
     }
 
-    async fn store(&mut self, key: u16, data: &[u8]) -> Result<(), Error> {
-        T::store(self, key, data).await
+    async fn store(&mut self, key: u16, data: &[u8], buf: &mut [u8]) -> Result<(), Error> {
+        T::store(self, key, data, buf).await
     }
 
-    async fn remove(&mut self, key: u16) -> Result<(), Error> {
-        T::remove(self, key).await
+    async fn remove(&mut self, key: u16, buf: &mut [u8]) -> Result<(), Error> {
+        T::remove(self, key, buf).await
     }
 }
 
@@ -104,11 +106,11 @@ impl KvBlobStore for DummyKvBlobStore {
         Ok(None)
     }
 
-    async fn store(&mut self, _key: u16, _data: &[u8]) -> Result<(), Error> {
+    async fn store(&mut self, _key: u16, _data: &[u8], _buf: &mut [u8]) -> Result<(), Error> {
         Ok(())
     }
 
-    async fn remove(&mut self, _key: u16) -> Result<(), Error> {
+    async fn remove(&mut self, _key: u16, _buf: &mut [u8]) -> Result<(), Error> {
         Ok(())
     }
 }
@@ -300,10 +302,12 @@ where
         let (mut kv, buf) = self.kvb.split();
 
         if let Some(key) = self.key {
+            let (data, buf) = buf.split_at_mut(self.len);
+
             if self.len > 0 {
-                kv.store(key, &buf[..self.len]).await?;
+                kv.store(key, data, buf).await?;
             } else {
-                kv.remove(key).await?;
+                kv.remove(key, buf).await?;
             }
         }
 
@@ -420,11 +424,11 @@ mod fileio {
             Self::load(self, key, buf)
         }
 
-        async fn store(&mut self, key: u16, data: &[u8]) -> Result<(), Error> {
+        async fn store(&mut self, key: u16, data: &[u8], _buf: &mut [u8]) -> Result<(), Error> {
             Self::store(self, key, data)
         }
 
-        async fn remove(&mut self, key: u16) -> Result<(), Error> {
+        async fn remove(&mut self, key: u16, _buf: &mut [u8]) -> Result<(), Error> {
             Self::remove(self, key)
         }
     }
@@ -559,11 +563,11 @@ mod fileio {
             Self::load(self, key, buf)
         }
 
-        async fn store(&mut self, key: u16, data: &[u8]) -> Result<(), Error> {
+        async fn store(&mut self, key: u16, data: &[u8], _buf: &mut [u8]) -> Result<(), Error> {
             Self::store(self, key, data)
         }
 
-        async fn remove(&mut self, key: u16) -> Result<(), Error> {
+        async fn remove(&mut self, key: u16, _buf: &mut [u8]) -> Result<(), Error> {
             Self::remove(self, key)
         }
     }