make code more idiomatic

dojoengine · Jul 31, 2024 · 0aa5d3e · 0aa5d3e
1 parent ccd9a59
commit 0aa5d3e
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/crates/sozo/ops/src/migration/migrate.rs b/crates/sozo/ops/src/migration/migrate.rs
@@ -957,13 +957,12 @@ where
                     .map(|rw| {
                         let resource = &rw.resource;
                         match resource {
-                            ResourceType::Selector(s) => {
-                                if let Some(r) = resource_map.get(&s.to_hex_string()) {
-                                    r.clone()
-                                } else {
-                                    resource.clone()
-                                }
-                            }
+                            // Replace selector with appropriate resource type if present in
+                            // resource_map
+                            ResourceType::Selector(s) => resource_map
+                                .get(&s.to_hex_string())
+                                .cloned()
+                                .unwrap_or_else(|| rw.resource.clone()),
                             _ => resource.clone(),
                         }
                     })
@@ -984,13 +983,10 @@ where
                         match resource {
                             // Replace selector with appropriate resource type if present in
                             // resource_map
-                            ResourceType::Selector(s) => {
-                                if let Some(r) = resource_map.get(&s.to_hex_string()) {
-                                    r.clone()
-                                } else {
-                                    resource.clone()
-                                }
-                            }
+                            ResourceType::Selector(s) => resource_map
+                                .get(&s.to_hex_string())
+                                .cloned()
+                                .unwrap_or_else(|| rw.resource.clone()),
                             _ => resource.clone(),
                         }
                     })