Continue manual cleanup

Author: TrueDoctor

editor/src/dispatcher.rs

@@ -189,18 +189,15 @@ impl Dispatcher {
 				}
 				Message::Frontend(message) => {
 					// Handle these messages immediately by returning early
-					match message {
-						FrontendMessage::TriggerFontLoad { .. } => {
-							self.responses.push(message);
-							self.cleanup_queues(false);
+					if let FrontendMessage::TriggerFontLoad { .. } = message {
+						self.responses.push(message);
+						self.cleanup_queues(false);
 
-							// Return early to avoid running the code after the match block
-							return;
-						}
-						_ => {
-							// `FrontendMessage`s are saved and will be sent to the frontend after the message queue is done being processed
-							self.responses.push(message);
-						}
+						// Return early to avoid running the code after the match block
+						return;
+					} else {
+						// `FrontendMessage`s are saved and will be sent to the frontend after the message queue is done being processed
+						self.responses.push(message);
 					}
 				}
 				Message::Globals(message) => {

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -2080,14 +2080,12 @@ impl NodeGraphMessageHandler {
 						wire_end: InputConnector::node(wire_end, wire_end_input_index),
 						dashed: false,
 					}),
-					_ => match *input {
-						NodeInput::Network { import_index, .. } => Some(FrontendNodeWire {
-							wire_start: OutputConnector::Import(import_index),
-							wire_end: InputConnector::node(wire_end, wire_end_input_index),
-							dashed: false,
-						}),
-						_ => None,
-					},
+					NodeInput::Network { import_index, .. } => Some(FrontendNodeWire {
+						wire_start: OutputConnector::Import(import_index),
+						wire_end: InputConnector::node(wire_end, wire_end_input_index),
+						dashed: false,
+					}),
+					_ => None,
 				}
 			})
 			.collect::<Vec<_>>();
@@ -2114,11 +2112,13 @@ impl NodeGraphMessageHandler {
 						wire_end: InputConnector::Export(i),
 						dashed,
 					});
-				} else if let NodeInput::Network { import_index, .. } = *export { wires.push(FrontendNodeWire {
-    							wire_start: OutputConnector::Import(import_index),
-    							wire_end: InputConnector::Export(i),
-    							dashed,
-    						}) }
+				} else if let NodeInput::Network { import_index, .. } = *export {
+					wires.push(FrontendNodeWire {
+						wire_start: OutputConnector::Import(import_index),
+						wire_end: InputConnector::Export(i),
+						dashed,
+					})
+				}
 			}
 		}
 		wires
@@ -2279,19 +2279,12 @@ impl NodeGraphMessageHandler {
 		let mut current_network = network_interface.nested_network(&current_network_path).unwrap();
 		let mut subgraph_names = vec!["Document".to_string()];
 		for node_id in breadcrumb_network_path {
-			match current_network.nodes.get(node_id) {
-				Some(node) => {
-					if let Some(network) = node.implementation.get_network() {
-						current_network = network;
-					};
-					subgraph_names.push(network_interface.frontend_display_name(node_id, &current_network_path));
-					current_network_path.push(*node_id)
-				}
-				_ => {
-					// Could not get node in network in breadcrumb_network_path
-					return None;
-				}
+			let node = current_network.nodes.get(node_id)?;
+			if let Some(network) = node.implementation.get_network() {
+				current_network = network;
 			};
+			subgraph_names.push(network_interface.frontend_display_name(node_id, &current_network_path));
+			current_network_path.push(*node_id)
 		}
 		Some(subgraph_names)
 	}

editor/src/messages/portfolio/document/overlays/grid_overlays.rs

@@ -212,9 +212,9 @@ pub fn grid_overlay(document: &DocumentMessageHandler, overlay_context: &mut Ove
 pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 	let mut widgets = Vec::new();
 	fn update_val<I, F: Fn(&mut GridSnapping, &I)>(grid: &GridSnapping, update: F) -> impl Fn(&I) -> Message + use<I, F> {
-		let new_grid = grid.clone();
+		let grid = grid.clone();
 		move |input: &I| {
-			let mut grid = new_grid.clone();
+			let mut grid = grid.clone();
 			update(&mut grid, input);
 			DocumentMessage::GridOptions(grid).into()
 		}

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

@@ -977,24 +977,21 @@ impl NodeNetworkInterface {
 				log::error!("Could not get node {node_id} in upstream_nodes_below_layer");
 				break;
 			};
-			match current_node
+			if let Some(primary_node_id) = current_node
 				.inputs
 				.iter()
 				.filter(|input| input.is_exposed_to_frontend(network_path.is_empty()))
 				.nth(if self.is_layer(&current_node_id, network_path) { 1 } else { 0 })
 				.and_then(|left_input| left_input.as_node())
 			{
-				Some(primary_node_id) => {
-					if self.is_chain(&primary_node_id, network_path) {
-						current_node_id = primary_node_id;
-					} else {
-						potential_upstream_nodes.insert(primary_node_id);
-						break;
-					}
-				}
-				_ => {
+				if self.is_chain(&primary_node_id, network_path) {
+					current_node_id = primary_node_id;
+				} else {
+					potential_upstream_nodes.insert(primary_node_id);
 					break;
 				}
+			} else {
+				break;
 			}
 		}
 
@@ -4680,21 +4677,18 @@ impl NodeNetworkInterface {
 			return;
 		};
 
-		match &mut node_metadata.persistent_metadata.node_type_metadata {
-			NodeTypePersistentMetadata::Node(node_metadata) => {
-				if node_metadata.position == NodePosition::Absolute(position) {
-					return;
-				}
-				node_metadata.position = NodePosition::Absolute(position);
-				self.transaction_modified();
+		if let NodeTypePersistentMetadata::Node(node_metadata) = &mut node_metadata.persistent_metadata.node_type_metadata {
+			if node_metadata.position == NodePosition::Absolute(position) {
+				return;
+			}
+			node_metadata.position = NodePosition::Absolute(position);
+			self.transaction_modified();
+		} else if let NodeTypePersistentMetadata::Layer(layer_metadata) = &mut node_metadata.persistent_metadata.node_type_metadata {
+			if layer_metadata.position == LayerPosition::Absolute(position) {
+				return;
 			}
-			_ => if let NodeTypePersistentMetadata::Layer(layer_metadata) = &mut node_metadata.persistent_metadata.node_type_metadata {
-   					if layer_metadata.position == LayerPosition::Absolute(position) {
-   						return;
-   					}
-   					layer_metadata.position = LayerPosition::Absolute(position);
-   					self.transaction_modified();
-   				},
+			layer_metadata.position = LayerPosition::Absolute(position);
+			self.transaction_modified();
 		}
 	}
 
@@ -5332,17 +5326,17 @@ impl NodeNetworkInterface {
 			}
 			_ => {
 				if let NodeTypePersistentMetadata::Node(node_metadata) = &mut node_metadata.persistent_metadata.node_type_metadata {
-    						if let NodePosition::Absolute(node_metadata) = &mut node_metadata.position {
-    							*node_metadata += shift;
-    							self.transaction_modified();
-    							// Unload click targets for all upstream nodes, since they may have been derived from the node that was shifted
-    							self.unload_upstream_node_click_targets(vec![*node_id], network_path);
-    							self.try_set_node_to_chain(node_id, network_path);
-    						} else if let NodePosition::Chain = node_metadata.position {
-    							self.set_upstream_chain_to_absolute(node_id, network_path);
-    							self.shift_node(node_id, shift, network_path);
-    						}
-    					}
+					if let NodePosition::Absolute(node_metadata) = &mut node_metadata.position {
+						*node_metadata += shift;
+						self.transaction_modified();
+						// Unload click targets for all upstream nodes, since they may have been derived from the node that was shifted
+						self.unload_upstream_node_click_targets(vec![*node_id], network_path);
+						self.try_set_node_to_chain(node_id, network_path);
+					} else if let NodePosition::Chain = node_metadata.position {
+						self.set_upstream_chain_to_absolute(node_id, network_path);
+						self.shift_node(node_id, shift, network_path);
+					}
+				}
 			}
 		}
 		// Unload click targets for all upstream nodes, since they may have been derived from the node that was shifted