Fix assorted Clippy lints (#3390)

Author: TrueDoctor

editor/src/dispatcher.rs

@@ -290,10 +290,10 @@ impl Dispatcher {
 		list.extend(self.message_handlers.input_preprocessor_message_handler.actions());
 		list.extend(self.message_handlers.key_mapping_message_handler.actions());
 		list.extend(self.message_handlers.debug_message_handler.actions());
-		if let Some(document) = self.message_handlers.portfolio_message_handler.active_document() {
-			if !document.graph_view_overlay_open {
-				list.extend(self.message_handlers.tool_message_handler.actions());
-			}
+		if let Some(document) = self.message_handlers.portfolio_message_handler.active_document()
+			&& !document.graph_view_overlay_open
+		{
+			list.extend(self.message_handlers.tool_message_handler.actions());
 		}
 		list.extend(self.message_handlers.portfolio_message_handler.actions());
 		list

editor/src/messages/layout/layout_message_handler.rs

@@ -156,10 +156,10 @@ impl LayoutMessageHandler {
 							let blue = color.get("blue").and_then(|x| x.as_f64()).map(|x| x as f32);
 							let alpha = color.get("alpha").and_then(|x| x.as_f64()).map(|x| x as f32);
 
-							if let (Some(red), Some(green), Some(blue), Some(alpha)) = (red, green, blue, alpha) {
-								if let Some(color) = Color::from_rgbaf32(red, green, blue, alpha) {
-									return Some(color);
-								}
+							if let (Some(red), Some(green), Some(blue), Some(alpha)) = (red, green, blue, alpha)
+								&& let Some(color) = Color::from_rgbaf32(red, green, blue, alpha)
+							{
+								return Some(color);
 							}
 							None
 						};

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -508,23 +508,22 @@ impl WidgetHolder {
 
 	/// Diffing updates self (where self is old) based on new, updating the list of modifications as it does so.
 	pub fn diff(&mut self, new: Self, widget_path: &mut [usize], widget_diffs: &mut Vec<WidgetDiff>) {
-		if let (Widget::PopoverButton(button1), Widget::PopoverButton(button2)) = (&mut self.widget, &new.widget) {
-			if button1.disabled == button2.disabled
-				&& button1.style == button2.style
-				&& button1.menu_direction == button2.menu_direction
-				&& button1.icon == button2.icon
-				&& button1.tooltip == button2.tooltip
-				&& button1.tooltip_shortcut == button2.tooltip_shortcut
-				&& button1.popover_min_width == button2.popover_min_width
-			{
-				let mut new_widget_path = widget_path.to_vec();
-				for (i, (a, b)) in button1.popover_layout.iter_mut().zip(button2.popover_layout.iter()).enumerate() {
-					new_widget_path.push(i);
-					a.diff(b.clone(), &mut new_widget_path, widget_diffs);
-					new_widget_path.pop();
-				}
-				return;
+		if let (Widget::PopoverButton(button1), Widget::PopoverButton(button2)) = (&mut self.widget, &new.widget)
+			&& button1.disabled == button2.disabled
+			&& button1.style == button2.style
+			&& button1.menu_direction == button2.menu_direction
+			&& button1.icon == button2.icon
+			&& button1.tooltip == button2.tooltip
+			&& button1.tooltip_shortcut == button2.tooltip_shortcut
+			&& button1.popover_min_width == button2.popover_min_width
+		{
+			let mut new_widget_path = widget_path.to_vec();
+			for (i, (a, b)) in button1.popover_layout.iter_mut().zip(button2.popover_layout.iter()).enumerate() {
+				new_widget_path.push(i);
+				a.diff(b.clone(), &mut new_widget_path, widget_diffs);
+				new_widget_path.pop();
 			}
+			return;
 		}
 
 		// If there have been changes to the actual widget (not just the id)
@@ -621,15 +620,15 @@ impl DiffUpdate {
 		let apply_shortcut_to_tooltip = |tooltip_shortcut: &mut ActionKeys, tooltip: &mut String| {
 			let shortcut_text = tooltip_shortcut.to_keys(action_input_mapping);
 
-			if let ActionKeys::Keys(_keys) = tooltip_shortcut {
-				if !shortcut_text.is_empty() {
-					if !tooltip.is_empty() {
-						tooltip.push(' ');
-					}
-					tooltip.push('(');
-					tooltip.push_str(&shortcut_text);
-					tooltip.push(')');
+			if let ActionKeys::Keys(_keys) = tooltip_shortcut
+				&& !shortcut_text.is_empty()
+			{
+				if !tooltip.is_empty() {
+					tooltip.push(' ');
 				}
+				tooltip.push('(');
+				tooltip.push_str(&shortcut_text);
+				tooltip.push(')');
 			}
 		};
 

editor/src/messages/portfolio/document/node_graph/document_node_definitions/document_node_derive.rs

@@ -14,10 +14,10 @@ pub(super) fn post_process_nodes(mut custom: Vec<DocumentNodeDefinition>) -> Vec
 			..
 		} = node_template;
 
-		if let DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier { name }) = implementation {
-			if let Some((new_name, _suffix)) = name.rsplit_once("<") {
-				*name = Cow::Owned(new_name.to_string())
-			}
+		if let DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier { name }) = implementation
+			&& let Some((new_name, _suffix)) = name.rsplit_once("<")
+		{
+			*name = Cow::Owned(new_name.to_string())
 		};
 	}
 

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

@@ -1011,10 +1011,11 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 						// Disconnect if the wire was previously connected to an input
 						if let Some(disconnecting) = &self.disconnecting {
 							let mut disconnect_root_node = false;
-							if let Previewing::Yes { root_node_to_restore } = network_interface.previewing(selection_network_path) {
-								if root_node_to_restore.is_some() && *disconnecting == InputConnector::Export(0) {
-									disconnect_root_node = true;
-								}
+							if let Previewing::Yes { root_node_to_restore } = network_interface.previewing(selection_network_path)
+								&& root_node_to_restore.is_some()
+								&& *disconnecting == InputConnector::Export(0)
+							{
+								disconnect_root_node = true;
 							}
 							if disconnect_root_node {
 								responses.add(NodeGraphMessage::DisconnectRootNode);
@@ -1168,13 +1169,13 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 					responses.add(NodeGraphMessage::TogglePreview { node_id: preview_node });
 					self.preview_on_mouse_up = None;
 				}
-				if let Some(node_to_deselect) = self.deselect_on_pointer_up.take() {
-					if !self.drag_start.as_ref().is_some_and(|t| t.1) {
-						let mut new_selected_nodes = selected_nodes.selected_nodes_ref().clone();
-						new_selected_nodes.remove(node_to_deselect);
-						responses.add(NodeGraphMessage::SelectedNodesSet { nodes: new_selected_nodes });
-						return;
-					}
+				if let Some(node_to_deselect) = self.deselect_on_pointer_up.take()
+					&& !self.drag_start.as_ref().is_some_and(|t| t.1)
+				{
+					let mut new_selected_nodes = selected_nodes.selected_nodes_ref().clone();
+					new_selected_nodes.remove(node_to_deselect);
+					responses.add(NodeGraphMessage::SelectedNodesSet { nodes: new_selected_nodes });
+					return;
 				}
 				let point = network_metadata
 					.persistent_metadata

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

@@ -492,7 +492,7 @@ pub fn footprint_widget(parameter_widgets_info: ParameterWidgetsInfo, extra_widg
 		);
 	}
 
-	let widgets = vec![
+	let widgets = [
 		LayoutGroup::Row { widgets: location_widgets },
 		LayoutGroup::Row { widgets: scale_widgets },
 		LayoutGroup::Row { widgets: resolution_widgets },

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

@@ -213,10 +213,10 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 	}
 	let update_origin = |grid, update: fn(&mut GridSnapping) -> Option<&mut f64>| {
 		update_val::<NumberInput, _>(grid, move |grid, val| {
-			if let Some(val) = val.value {
-				if let Some(update) = update(grid) {
-					*update = val;
-				}
+			if let Some(val) = val.value
+				&& let Some(update) = update(grid)
+			{
+				*update = val;
 			}
 		})
 	};

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

@@ -91,16 +91,14 @@ impl DocumentMetadata {
 
 		let mut use_local = true;
 		let graph_layer = graph_modification_utils::NodeGraphLayer::new(layer, network_interface);
-		if let Some(path_node) = graph_layer.upstream_visible_node_id_from_name_in_layer("Path") {
-			if let Some(&source) = self.first_element_source_ids.get(&layer.to_node()) {
-				if !network_interface
-					.upstream_flow_back_from_nodes(vec![path_node], &[], FlowType::HorizontalFlow)
-					.any(|upstream| Some(upstream) == source)
-				{
-					use_local = false;
-					info!("Local transform is invalid — using the identity for the local transform instead")
-				}
-			}
+		if let Some(path_node) = graph_layer.upstream_visible_node_id_from_name_in_layer("Path")
+			&& let Some(&source) = self.first_element_source_ids.get(&layer.to_node())
+			&& !network_interface
+				.upstream_flow_back_from_nodes(vec![path_node], &[], FlowType::HorizontalFlow)
+				.any(|upstream| Some(upstream) == source)
+		{
+			use_local = false;
+			info!("Local transform is invalid — using the identity for the local transform instead")
 		}
 		let local_transform = use_local.then(|| self.local_transforms.get(&layer.to_node()).copied()).flatten().unwrap_or_default();