Fix clippy lints (#1327)

* Fix clippy lints

* Update formatting

* Remove unsafe send impls

* New type for Rc<NodeContainer>

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

@@ -111,7 +111,7 @@ impl DocumentNode {
 		P: Fn(String, usize) -> Option<NodeInput>,
 	{
 		for (index, input) in self.inputs.iter_mut().enumerate() {
-			let &mut NodeInput::Node{node_id: id, output_index, lambda} = input else {
+			let &mut NodeInput::Node { node_id: id, output_index, lambda } = input else {
 				continue;
 			};
 			if let Some(&new_id) = new_ids.get(&id) {
@@ -538,7 +538,7 @@ impl NodeNetwork {
 		while !dependencies.is_empty() {
 			let Some((&disconnected, _)) = dependencies.iter().find(|(_, l)| l.is_empty()) else {
 				error!("Dependencies {dependencies:?}");
-				return false
+				return false;
 			};
 			dependencies.remove(&disconnected);
 			for connections in dependencies.values_mut() {
@@ -655,12 +655,10 @@ impl NodeNetwork {
 	/// Recursively dissolve non-primitive document nodes and return a single flattened network of nodes.
 	pub fn flatten_with_fns(&mut self, node: NodeId, map_ids: impl Fn(NodeId, NodeId) -> NodeId + Copy, gen_id: impl Fn() -> NodeId + Copy) {
 		self.resolve_extract_nodes();
-		let Some((id, mut node)) = self
-			.nodes
-			.remove_entry(&node) else {
-				warn!("The node which was supposed to be flattened does not exist in the network, id {} network {:#?}", node, self);
-				return;
-			};
+		let Some((id, mut node)) = self.nodes.remove_entry(&node) else {
+			warn!("The node which was supposed to be flattened does not exist in the network, id {} network {:#?}", node, self);
+			return;
+		};
 
 		if self.disabled.contains(&id) {
 			node.implementation = DocumentNodeImplementation::Unresolved("graphene_core::ops::IdNode".into());

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

@@ -194,7 +194,7 @@ impl<'a> TaggedValue {
 			TaggedValue::F64(x) => x.to_string() + "_f64",
 			TaggedValue::Bool(x) => x.to_string(),
 			TaggedValue::BlendMode(blend_mode) => "BlendMode::".to_string() + &blend_mode.to_string(),
-			TaggedValue::Color(color) => "graphene_core::Color::from_rgbaf32_unchecked(0.,0.,0.,1.)".to_string(),
+			TaggedValue::Color(color) => format!("Color {color:?}"),
 			_ => panic!("Cannot convert to primitive string"),
 		}
 	}

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

@@ -112,8 +112,8 @@ impl ImaginateStatus {
 			Self::Beginning => Cow::Borrowed("Beginning…"),
 			Self::Uploading => Cow::Borrowed("Downloading Image…"),
 			Self::Generating(percent) => Cow::Owned(format!("Generating {percent:.0}%")),
-			Self::Terminating => Cow::Owned(format!("Terminating…")),
-			Self::Terminated => Cow::Owned(format!("Terminated")),
+			Self::Terminating => Cow::Owned("Terminating…".to_string()),
+			Self::Terminated => Cow::Owned("Terminated".to_string()),
 			Self::Failed(err) => Cow::Owned(format!("Failed: {err}")),
 		}
 	}

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

@@ -2,7 +2,6 @@ use std::borrow::Cow;
 
 use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
-use std::sync::Arc;
 
 use std::hash::Hash;
 use xxhash_rust::xxh3::Xxh3;
@@ -19,13 +18,16 @@ pub type DynFuture<'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>>;
 pub type Any<'n> = Box<dyn DynAny<'n> + 'n>;
 pub type FutureAny<'n> = DynFuture<'n, Any<'n>>;
+// TODO: is this safe? This is assumed to be send+sync.
 pub type TypeErasedNode<'n> = dyn for<'i> NodeIO<'i, Any<'i>, Output = FutureAny<'i>> + 'n;
 pub type TypeErasedPinnedRef<'n> = Pin<&'n TypeErasedNode<'n>>;
 pub type TypeErasedRef<'n> = &'n TypeErasedNode<'n>;
 pub type TypeErasedBox<'n> = Box<TypeErasedNode<'n>>;
 pub type TypeErasedPinned<'n> = Pin<Box<TypeErasedNode<'n>>>;
 
-pub type NodeConstructor = for<'a> fn(Vec<Arc<NodeContainer>>) -> DynFuture<'static, TypeErasedBox<'static>>;
+pub type SharedNodeContainer = std::rc::Rc<NodeContainer>;
+
+pub type NodeConstructor = for<'a> fn(Vec<SharedNodeContainer>) -> DynFuture<'static, TypeErasedBox<'static>>;
 
 #[derive(Clone)]
 pub struct NodeContainer {
@@ -64,9 +66,9 @@ impl core::fmt::Debug for NodeContainer {
 }
 
 impl NodeContainer {
-	pub fn new(node: TypeErasedBox<'static>) -> Arc<Self> {
+	pub fn new(node: TypeErasedBox<'static>) -> SharedNodeContainer {
 		let node = Box::leak(node);
-		Arc::new(Self { node })
+		Self { node }.into()
 	}
 
 	#[cfg(feature = "dealloc_nodes")]
@@ -89,7 +91,7 @@ impl core::fmt::Display for ProtoNetwork {
 		f.write_str("Proto Network with nodes: ")?;
 		fn write_node(f: &mut core::fmt::Formatter<'_>, network: &ProtoNetwork, id: NodeId, indent: usize) -> core::fmt::Result {
 			f.write_str(&"\t".repeat(indent))?;
-			let Some((_, node)) = network.nodes.iter().find(|(node_id, _)|*node_id == id) else {
+			let Some((_, node)) = network.nodes.iter().find(|(node_id, _)| *node_id == id) else {
 				return f.write_str("{{Unknown Node}}");
 			};
 			f.write_str("Node: ")?;