Start adapting nodes to new version

node-graph/nodes/gcore/src/memo.rs

@@ -1,4 +1,4 @@
-use core_types::WasmNotSend;
+use core_types::gpoll::Interrupt;
 use core_types::graphene_hash::CacheHash;
 use core_types::memo::*;
 use std::hash::DefaultHasher;
@@ -10,7 +10,7 @@ use std::sync::Mutex;
 ///
 /// Stores the last evaluated data that flowed through this node and immediately returns that data on subsequent renders if the context has not changed.
 #[node_macro::node(category("General"), path(graphene_core::memo), skip_impl)]
-async fn memoize<I: CacheHash + Send + 'n, T: Clone + WasmNotSend>(input: I, #[data] cache: Arc<Mutex<Option<(u64, T)>>>, content: impl Node<I, Output = T>) -> T {
+fn memoize<I: CacheHash, T: Clone>(input: I, #[data] cache: Arc<Mutex<Option<(u64, T)>>>, content: impl Node<I, Output = T>) -> Result<T, Interrupt> {
 	// Caches the output of a given node called with a specific input.
 	//
 	// A cache miss occurs when the Option is None. In this case, the node evaluates the inner node and memoizes (stores) the result.
@@ -24,28 +24,31 @@ async fn memoize<I: CacheHash + Send + 'n, T: Clone + WasmNotSend>(input: I, #[d
 	let hash = hasher.finish();
 
 	if let Some(data) = cache.lock().as_ref().unwrap().as_ref().and_then(|data| (data.0 == hash).then_some(data.1.clone())) {
-		return data;
+		return Ok(data);
 	}
 
-	let value = content.eval(input).await;
+	let value = content.eval(input)?;
 	*cache.lock().unwrap() = Some((hash, value.clone()));
-	value
+	Ok(value)
 }
 
 type MonitorValue<I, T> = Arc<Mutex<Option<Arc<IORecord<I, T>>>>>;
 
 /// The Monitor node is used by the editor to access the data flowing through it.
 #[node_macro::node(category(""), path(graphene_core::memo), serialize(serialize_monitor), properties("monitor_properties"), skip_impl)]
-async fn monitor<I: Clone + 'static + Send + Sync, T: Clone + 'static + Send + Sync>(
+fn monitor<I: Clone + 'static + Send + Sync, T: Clone + 'static + Send + Sync>(
 	input: I,
 	#[allow(clippy::type_complexity)]
 	#[data]
 	io: MonitorValue<I, T>,
 	content: impl Node<I, Output = T>,
-) -> T {
-	let output = content.eval(input.clone()).await;
-	*io.lock().unwrap() = Some(Arc::new(IORecord { input, output: output.clone() }));
-	output
+) -> Result<T, Interrupt> {
+	let output = content.eval(input)?;
+	*io.lock().unwrap() = Some(Arc::new(IORecord {
+		input: input.clone(),
+		output: output.clone(),
+	}));
+	Ok(output)
 }
 
 fn serialize_monitor<I: Clone + 'static + Send + Sync, T: Clone + 'static + Send + Sync>(io: &MonitorValue<I, T>) -> Option<Arc<dyn std::any::Any + Send + Sync>> {