Cleanup

Author: TrueDoctor

node-graph/gcore/src/registry.rs

@@ -77,10 +77,6 @@ pub static NODE_METADATA: LazyLock<Mutex<HashMap<String, NodeMetadata>>> = LazyL
 pub type DynFuture<'n, T> = Pin<Box<dyn core::future::Future<Output = T> + 'n + Send>>;
 #[cfg(target_arch = "wasm32")]
 pub type DynFuture<'n, T> = Pin<Box<dyn core::future::Future<Output = T> + 'n>>;
-#[cfg(not(target_arch = "wasm32"))]
-pub type SyncFuture<'n, T> = Pin<Box<dyn core::future::Future<Output = T> + 'n + Send + Sync>>;
-#[cfg(target_arch = "wasm32")]
-pub type SyncFuture<'n, T> = Pin<Box<dyn core::future::Future<Output = T> + 'n>>;
 pub type LocalFuture<'n, T> = Pin<Box<dyn core::future::Future<Output = T> + 'n>>;
 #[cfg(not(target_arch = "wasm32"))]
 pub type Any<'n> = Box<dyn DynAny<'n> + 'n + Send>;

node-graph/graph-craft/src/document.rs

@@ -287,16 +287,10 @@ impl DocumentNode {
 
 	fn resolve_proto_node(mut self) -> ProtoNode {
 		assert!(!self.inputs.is_empty() || self.manual_composition.is_some(), "Resolving document node {self:#?} with no inputs");
-		let DocumentNodeImplementation::ProtoNode(fqn) = self.implementation else {
+		let DocumentNodeImplementation::ProtoNode(identifier) = self.implementation else {
 			unreachable!("tried to resolve not flattened node on resolved node {self:?}");
 		};
 
-		let identifier = fqn;
-		// TODO replace with proper generics removal
-		// let identifier = match fqn.name.clone().split_once('<') {
-		// 	Some((path, _generics)) => ProtoNodeIdentifier { name: Cow::Owned(path.to_string()) },
-		// 	_ => ProtoNodeIdentifier { name: fqn.name },
-		// };
 		let (input, mut args) = if let Some(ty) = self.manual_composition {
 			(ProtoNodeInput::ManualComposition(ty), ConstructionArgs::Nodes(vec![]))
 		} else {

node-graph/graph-craft/src/proto.rs

@@ -731,7 +731,6 @@ impl TypingContext {
 					.map(|generic| check_generic(node_io, &primary_input_or_call_argument, &inputs, generic).map(|x| (generic.to_string(), x)))
 					.collect();
 
-				// TODO: Proper error handling
 				generics_lookup.map(|generics_lookup| {
 					let orig_node_io = (*node_io).clone();
 					let mut new_node_io = orig_node_io.clone();
@@ -748,7 +747,6 @@ impl TypingContext {
 			[] => {
 				let mut best_errors = usize::MAX;
 				let mut error_inputs = Vec::new();
-				log::debug!("impls: {impls:?}");
 				for node_io in impls.keys() {
 					let current_errors = [&primary_input_or_call_argument]
 						.into_iter()
@@ -850,7 +848,6 @@ fn check_generic(types: &NodeIOTypes, input: &Type, parameters: &[Type], generic
 	if outputs.any(|ty| ty != out_ty) {
 		return Err(format!("Generic output type {generic} is dependent on multiple inputs or parameters",));
 	}
-	log::debug!("concrete type: {}", out_ty);
 	Ok(out_ty.clone())
 }
 

node-graph/interpreted-executor/src/node_registry.rs

@@ -329,14 +329,11 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		// This occurs for the ChannelMixerNode presumably because of the long name.
 		// This might be caused by the stringify! macro
 		let mut new_name = id.name.replace('\n', " ");
-		// Remove struct generics
-		log::debug!("into node with path: {}", new_name);
+		// Remove struct generics for all nodes except for the IntoNode
 		if !new_name.contains("IntoNode") {
 			if let Some((path, _generics)) = new_name.split_once("<") {
 				new_name = path.to_string();
 			}
-		} else {
-			log::debug!("into node with path: {}", new_name);
 		}
 		let nid = ProtoNodeIdentifier { name: Cow::Owned(new_name) };
 		map.entry(nid).or_default().insert(types.clone(), c);