moved fn remove_vid

Author: Zoran Cvetkov

graph/src/components/store/entity_cache.rs

@@ -212,8 +212,20 @@ impl EntityCache {
         // a legacy subgraph that has VID autoincremented while this trait
         // always creates it in a new style.
         debug_assert!(match scope {
-            GetScope::Store =>
-                remove_vid(entity.clone()) == remove_vid(self.store.get(key).unwrap().map(Arc::new)),
+            GetScope::Store => {
+                // Release build will never call this function and hence it's OK
+                // when that implementation is not correct.
+                fn remove_vid(entity: Option<Arc<Entity>>) -> Option<Entity> {
+                    entity.map(|e| {
+                        #[allow(unused_mut)]
+                        let mut entity = (*e).clone();
+                        #[cfg(debug_assertions)]
+                        entity.remove("vid");
+                        entity
+                    })
+                }
+                remove_vid(entity.clone()) == remove_vid(self.store.get(key).unwrap().map(Arc::new))
+            }
             GetScope::InBlock => true,
         });
 
@@ -558,18 +570,3 @@ impl EntityCache {
         })
     }
 }
-
-// Release build still needs this function althought it will never call it
-#[cfg(not(debug_assertions))]
-fn remove_vid(_: Option<Arc<Entity>>) -> Option<Entity> {
-    None
-}
-
-#[cfg(debug_assertions)]
-fn remove_vid(entity: Option<Arc<Entity>>) -> Option<Entity> {
-    entity.map(|e| {
-        let mut entity = (*e).clone();
-        entity.remove("vid");
-        entity
-    })
-}