feat: remove clone by borrowing

filecoin-project · Mar 1, 2024 · f55f466 · f55f466
1 parent 4e4bdd1
commit f55f466
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/actors/market/src/state.rs b/actors/market/src/state.rs
@@ -390,7 +390,7 @@ impl State {
         store: BS,
     ) -> Result<SetMultimap<BS, ChainEpoch, DealID>, ActorError>
     where
-        BS: Blockstore + Clone,
+        BS: Blockstore,
     {
         DealOpsByEpoch::load(store, &self.deal_ops_by_epoch, DEAL_OPS_BY_EPOCH_CONFIG, "deal ops")
     }

diff --git a/actors/market/tests/harness.rs b/actors/market/tests/harness.rs
@@ -1170,7 +1170,7 @@ pub fn assert_n_good_deals<BS>(
     epoch: ChainEpoch,
     n: isize,
 ) where
-    BS: fvm_ipld_blockstore::Blockstore + Clone,
+    BS: fvm_ipld_blockstore::Blockstore,
 {
     let mut count = 0;
     dobe.for_each_in(&epoch, |id| {

diff --git a/runtime/src/util/set_multimap.rs b/runtime/src/util/set_multimap.rs
@@ -29,7 +29,7 @@ where
 
 impl<BS, K, V> SetMultimap<BS, K, V>
 where
-    BS: Blockstore + Clone,
+    BS: Blockstore,
     K: MapKey,
     V: MapKey,
 {
@@ -66,7 +66,7 @@ where
     pub fn put(&mut self, key: &K, value: V) -> Result<(), ActorError> {
         // Load HAMT from retrieved cid or create a new empty one.
         let mut inner = self.get(key)?.unwrap_or_else(|| {
-            Set::empty(self.outer.store().clone(), self.inner_config.clone(), "multimap inner")
+            Set::empty(self.outer.store(), self.inner_config.clone(), "multimap inner")
         });
 
         inner.put(&value)?;
@@ -78,7 +78,7 @@ where
     /// Puts slice of values in the hash set associated with a key.
     pub fn put_many(&mut self, key: &K, values: &[V]) -> Result<(), ActorError> {
         let mut inner = self.get(key)?.unwrap_or_else(|| {
-            Set::empty(self.outer.store().clone(), self.inner_config.clone(), "multimap inner")
+            Set::empty(self.outer.store(), self.inner_config.clone(), "multimap inner")
         });
 
         for v in values {
@@ -91,10 +91,10 @@ where
 
     /// Gets the set of values for a key.
     #[inline]
-    pub fn get(&self, key: &K) -> Result<Option<Set<BS, V>>, ActorError> {
+    pub fn get(&self, key: &K) -> Result<Option<Set<&BS, V>>, ActorError> {
         match self.outer.get(key)? {
             Some(cid) => Ok(Some(Set::load(
-                self.outer.store().clone(),
+                self.outer.store(),
                 cid,
                 self.inner_config.clone(),
                 "multimap inner",