Merge pull request #451 from CosmWasm/1498-key-only-iteration-let-else

Use let-else
CosmWasm · Aug 28, 2023 · 6b84068 · 6b84068
2 parents 65cfd95 + 2c6f8a7
commit 6b84068
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/libwasmvm/src/iterator.rs b/libwasmvm/src/iterator.rs
@@ -66,9 +66,7 @@ impl GoIter {
     }
 
     pub fn next(&mut self) -> BackendResult<Option<Record>> {
-        let next = if let Some(f) = self.vtable.next {
-            f
-        } else {
+        let Some(next) = self.vtable.next else {
             let result = Err(BackendError::unknown(
                 "iterator vtable function 'next' not set",
             ));
@@ -139,9 +137,7 @@ impl GoIter {
         >,
         fn_name: &str,
     ) -> BackendResult<Option<Vec<u8>>> {
-        let next = if let Some(f) = next_fn {
-            f
-        } else {
+        let Some(next) = next_fn else {
             let result = Err(BackendError::unknown(format!(
                 "iterator vtable function '{fn_name}' not set"
             )));

diff --git a/libwasmvm/src/storage.rs b/libwasmvm/src/storage.rs
@@ -104,9 +104,7 @@ impl Storage for GoStorage {
     }
 
     fn next(&mut self, iterator_id: u32) -> BackendResult<Option<Record>> {
-        let iterator = if let Some(i) = self.iterators.get_mut(&iterator_id) {
-            i
-        } else {
+        let Some(iterator) = self.iterators.get_mut(&iterator_id) else {
             return (
                 Err(BackendError::iterator_does_not_exist(iterator_id)),
                 GasInfo::free(),
@@ -116,9 +114,7 @@ impl Storage for GoStorage {
     }
 
     fn next_key(&mut self, iterator_id: u32) -> BackendResult<Option<Vec<u8>>> {
-        let iterator = if let Some(i) = self.iterators.get_mut(&iterator_id) {
-            i
-        } else {
+        let Some(iterator) = self.iterators.get_mut(&iterator_id) else {
             return (
                 Err(BackendError::iterator_does_not_exist(iterator_id)),
                 GasInfo::free(),
@@ -129,9 +125,7 @@ impl Storage for GoStorage {
     }
 
     fn next_value(&mut self, iterator_id: u32) -> BackendResult<Option<Vec<u8>>> {
-        let iterator = if let Some(i) = self.iterators.get_mut(&iterator_id) {
-            i
-        } else {
+        let Some(iterator) = self.iterators.get_mut(&iterator_id) else {
             return (
                 Err(BackendError::iterator_does_not_exist(iterator_id)),
                 GasInfo::free(),