Cleanup

Author: TrueDoctor

editor/src/messages/portfolio/document/utility_types/network_interface.rs

@@ -1,4 +1,5 @@
 mod deserialization;
+mod memo_network;
 
 use super::document_metadata::{DocumentMetadata, LayerNodeIdentifier, NodeRelations};
 use super::misc::PTZ;
@@ -26,7 +27,7 @@ use graphene_std::vector::{PointId, Vector, VectorModificationType};
 use interpreted_executor::dynamic_executor::ResolvedDocumentNodeTypes;
 use interpreted_executor::node_registry::NODE_REGISTRY;
 use kurbo::BezPath;
-use private::MemoNetwork;
+use memo_network::MemoNetwork;
 use serde_json::{Value, json};
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::hash::{DefaultHasher, Hash, Hasher};
@@ -69,65 +70,6 @@ impl PartialEq for NodeNetworkInterface {
 	}
 }
 
-mod private {
-	use std::cell::RefCell;
-	use std::hash::{Hash, Hasher};
-
-	use graph_craft::document::NodeNetwork;
-
-	#[derive(Debug, Default, Clone, PartialEq)]
-	pub struct MemoNetwork {
-		network: NodeNetwork,
-		hash_code: RefCell<Option<u64>>,
-	}
-
-	impl<'de> serde::Deserialize<'de> for MemoNetwork {
-		fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-		where
-			D: serde::Deserializer<'de>,
-		{
-			Ok(Self::new(NodeNetwork::deserialize(deserializer)?))
-		}
-	}
-
-	impl serde::Serialize for MemoNetwork {
-		fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-		where
-			S: serde::Serializer,
-		{
-			self.network.serialize(serializer)
-		}
-	}
-
-	impl Hash for MemoNetwork {
-		fn hash<H: Hasher>(&self, state: &mut H) {
-			self.current_hash().hash(state);
-		}
-	}
-
-	impl MemoNetwork {
-		pub fn network(&self) -> &NodeNetwork {
-			&self.network
-		}
-		pub fn network_mut(&mut self) -> &mut NodeNetwork {
-			self.hash_code.replace(None);
-			&mut self.network
-		}
-
-		pub fn new(network: NodeNetwork) -> Self {
-			Self { network, hash_code: None.into() }
-		}
-
-		pub fn current_hash(&self) -> u64 {
-			let mut hash_code = self.hash_code.borrow_mut();
-			if hash_code.is_none() {
-				*hash_code = Some(self.network.current_hash());
-			}
-			hash_code.unwrap()
-		}
-	}
-}
-
 impl NodeNetworkInterface {
 	/// Add DocumentNodePath input to the PathModifyNode protonode
 	pub fn migrate_path_modify_node(&mut self) {

editor/src/messages/portfolio/document/utility_types/network_interface/memo_network.rs

@@ -0,0 +1,57 @@
+use graph_craft::document::NodeNetwork;
+use std::cell::Cell;
+use std::hash::{Hash, Hasher};
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct MemoNetwork {
+	network: NodeNetwork,
+	hash_code: Cell<Option<u64>>,
+}
+
+impl<'de> serde::Deserialize<'de> for MemoNetwork {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: serde::Deserializer<'de>,
+	{
+		Ok(Self::new(NodeNetwork::deserialize(deserializer)?))
+	}
+}
+
+impl serde::Serialize for MemoNetwork {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
+		self.network.serialize(serializer)
+	}
+}
+
+impl Hash for MemoNetwork {
+	fn hash<H: Hasher>(&self, state: &mut H) {
+		self.current_hash().hash(state);
+	}
+}
+
+impl MemoNetwork {
+	pub fn network(&self) -> &NodeNetwork {
+		&self.network
+	}
+
+	pub fn network_mut(&mut self) -> &mut NodeNetwork {
+		self.hash_code.set(None);
+		&mut self.network
+	}
+
+	pub fn new(network: NodeNetwork) -> Self {
+		Self { network, hash_code: None.into() }
+	}
+
+	pub fn current_hash(&self) -> u64 {
+		let mut hash_code = self.hash_code.get();
+		if hash_code.is_none() {
+			hash_code = Some(self.network.current_hash());
+			self.hash_code.set(hash_code);
+		}
+		hash_code.unwrap()
+	}
+}