Resolve most Clippy lint issues

Author: Keavon

editor/src/dispatcher.rs

@@ -480,7 +480,7 @@ mod test {
 
 			let responses = editor.handle_message(PortfolioMessage::OpenDocumentFile {
 				document_name: document_name.into(),
-				document_serialized_content: document_serialized_content.into(),
+				document_serialized_content,
 			});
 
 			for response in responses {

editor/src/messages/layout/layout_message_handler.rs

@@ -299,7 +299,7 @@ impl<F: Fn(&MessageDiscriminant) -> Vec<KeysGroup>> MessageHandler<LayoutMessage
 			}
 			WidgetValueUpdate { layout_target, widget_id, value } => {
 				self.handle_widget_callback(layout_target, widget_id, value, WidgetValueAction::Update, responses);
-				responses.add(ResendActiveWidget { layout_target, widget_id: widget_id });
+				responses.add(ResendActiveWidget { layout_target, widget_id });
 			}
 		}
 	}

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -101,7 +101,7 @@ impl Default for DocumentMessageHandler {
 			node_graph_handler: Default::default(),
 			navigation_handler: NavigationMessageHandler::default(),
 			overlays_message_handler: OverlaysMessageHandler::default(),
-			properties_panel_message_handler: PropertiesPanelMessageHandler::default(),
+			properties_panel_message_handler: PropertiesPanelMessageHandler,
 			// ============================================
 			// Fields that are saved in the document format
 			// ============================================
@@ -473,12 +473,12 @@ impl MessageHandler<DocumentMessage, DocumentInputs<'_>> for DocumentMessageHand
 					.deepest_common_ancestor(self.selected_nodes.selected_layers(self.metadata()), true)
 					.unwrap_or(LayerNodeIdentifier::ROOT);
 
-				let calculated_insert_index = parent.children(&self.metadata()).enumerate().find_map(|(index, direct_child)| {
+				let calculated_insert_index = parent.children(self.metadata()).enumerate().find_map(|(index, direct_child)| {
 					if self.selected_nodes.selected_layers(self.metadata()).any(|selected| selected == direct_child) {
 						return Some(index as isize);
 					}
 
-					for descendant in direct_child.decendants(&self.metadata()) {
+					for descendant in direct_child.decendants(self.metadata()) {
 						if self.selected_nodes.selected_layers(self.metadata()).any(|selected| selected == descendant) {
 							return Some(index as isize);
 						}
@@ -707,7 +707,7 @@ impl MessageHandler<DocumentMessage, DocumentInputs<'_>> for DocumentMessageHand
 				let metadata = self.metadata();
 				let all_layers_except_artboards = metadata.all_layers().filter(move |&layer| !metadata.is_artboard(layer));
 				let nodes = all_layers_except_artboards.map(|layer| layer.to_node()).collect();
-				responses.add(NodeGraphMessage::SelectedNodesSet { nodes: nodes });
+				responses.add(NodeGraphMessage::SelectedNodesSet { nodes });
 			}
 			SelectedLayersLower => {
 				responses.add(DocumentMessage::SelectedLayersReorder { relative_index_offset: 1 });
@@ -886,7 +886,7 @@ impl DocumentMessageHandler {
 		self.metadata
 			.root()
 			.decendants(&self.metadata)
-			.filter(|&layer| self.selected_nodes.layer_visible(layer, &self.network(), &self.metadata()))
+			.filter(|&layer| self.selected_nodes.layer_visible(layer, self.network(), self.metadata()))
 			.filter(|&layer| !is_artboard(layer, network))
 			.filter_map(|layer| self.metadata.click_target(layer).map(|targets| (layer, targets)))
 			.filter(move |(layer, target)| target.iter().any(move |target| target.intersect_rectangle(document_quad, self.metadata.transform_to_document(*layer))))
@@ -899,7 +899,7 @@ impl DocumentMessageHandler {
 		self.metadata
 			.root()
 			.decendants(&self.metadata)
-			.filter(|&layer| self.selected_nodes.layer_visible(layer, &self.network(), &self.metadata()))
+			.filter(|&layer| self.selected_nodes.layer_visible(layer, self.network(), self.metadata()))
 			.filter_map(|layer| self.metadata.click_target(layer).map(|targets| (layer, targets)))
 			.filter(move |(layer, target)| target.iter().any(|target: &ClickTarget| target.intersect_point(point, self.metadata.transform_to_document(*layer))))
 			.map(|(layer, _)| layer)
@@ -913,7 +913,7 @@ impl DocumentMessageHandler {
 	/// Get the combined bounding box of the click targets of the selected visible layers in viewport space
 	pub fn selected_visible_layers_bounding_box_viewport(&self) -> Option<[DVec2; 2]> {
 		self.selected_nodes
-			.selected_visible_layers(&self.network(), &self.metadata())
+			.selected_visible_layers(self.network(), self.metadata())
 			.filter_map(|layer| self.metadata.bounding_box_viewport(layer))
 			.reduce(graphene_core::renderer::Quad::combine_bounds)
 	}
@@ -952,7 +952,7 @@ impl DocumentMessageHandler {
 	}
 
 	/// Returns the bounding boxes for all visible layers.
-	pub fn bounding_boxes<'a>(&'a self) -> impl Iterator<Item = [DVec2; 2]> + 'a {
+	pub fn bounding_boxes(&self) -> impl Iterator<Item = [DVec2; 2]> + '_ {
 		// TODO: Remove this function entirely?
 		// self.visible_layers().filter_map(|path| self.document_legacy.viewport_bounding_box(path, font_cache).ok()?)
 		std::iter::empty()
@@ -1385,7 +1385,7 @@ impl DocumentMessageHandler {
 					}
 				}
 
-				(opacity_identical.then(|| first_opacity), blend_mode_identical.then(|| first_blend_mode))
+				(opacity_identical.then_some(first_opacity), blend_mode_identical.then_some(first_blend_mode))
 			})
 			.unwrap_or((None, None));
 
@@ -1406,12 +1406,12 @@ impl DocumentMessageHandler {
 		let layers_panel_options_bar = WidgetLayout::new(vec![LayoutGroup::Row {
 			widgets: vec![
 				DropdownInput::new(blend_mode_menu_entries)
-					.selected_index(blend_mode.map(|blend_mode| blend_mode.index_in_list_svg_subset()).flatten().map(|index| index as u32))
+					.selected_index(blend_mode.and_then(|blend_mode| blend_mode.index_in_list_svg_subset()).map(|index| index as u32))
 					.disabled(disabled)
 					.draw_icon(false)
 					.widget_holder(),
 				Separator::new(SeparatorType::Related).widget_holder(),
-				NumberInput::new(opacity.map(|opacity| opacity as f64))
+				NumberInput::new(opacity)
 					.label("Opacity")
 					.unit("%")
 					.display_decimal_places(2)

editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs

@@ -91,7 +91,7 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 				}
 
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 			}
 			FitViewportToSelection => {
 				if let Some(bounds) = selection_bounds {
@@ -188,7 +188,7 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 				ptz.tilt = 0.;
 				ptz.zoom = 1.;
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 			}
 			RotateCanvasBegin { was_dispatched_from_menu } => {
 				responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
@@ -218,14 +218,14 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 			}
 			SetCanvasTilt { angle_radians } => {
 				ptz.tilt = angle_radians;
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
 			}
 			SetCanvasZoom { zoom_factor } => {
 				ptz.zoom = zoom_factor.clamp(VIEWPORT_ZOOM_SCALE_MIN, VIEWPORT_ZOOM_SCALE_MAX);
 				ptz.zoom *= Self::clamp_zoom(ptz.zoom, document_bounds, old_zoom, ipp);
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 			}
 			TransformCanvasEnd { abort_transform } => {
 				if abort_transform {
@@ -236,12 +236,12 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 						}
 						TransformOperation::Pan { pre_commit_pan, .. } => {
 							ptz.pan = pre_commit_pan;
-							self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+							self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 						}
 						TransformOperation::Zoom { pre_commit_zoom, .. } => {
 							ptz.zoom = pre_commit_zoom;
 							responses.add(PortfolioMessage::UpdateDocumentWidgets);
-							self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+							self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 						}
 					}
 				}
@@ -263,7 +263,7 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 
 				ptz.pan += transformed_delta;
 				responses.add(BroadcastEvent::CanvasTransformed);
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 			}
 			TranslateCanvasBegin => {
 				responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Grabbing });
@@ -279,7 +279,7 @@ impl MessageHandler<NavigationMessage, (&DocumentMetadata, Option<[DVec2; 2]>, &
 				let transformed_delta = metadata.document_to_viewport.inverse().transform_vector2(delta * ipp.viewport_bounds.size());
 
 				ptz.pan += transformed_delta;
-				self.create_document_transform(ipp.viewport_bounds.center(), &ptz, responses);
+				self.create_document_transform(ipp.viewport_bounds.center(), ptz, responses);
 			}
 			WheelCanvasTranslate { use_y_as_x } => {
 				let delta = match use_y_as_x {

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

@@ -102,7 +102,7 @@ impl<'a> ModifyInputsContext<'a> {
 			}
 			*output = NodeOutput::new(*node_id, *output_index)
 		}
-		return None;
+		None
 	}
 
 	pub fn create_layer(&mut self, new_id: NodeId, output_node_id: NodeId, input_index: usize, skip_layer_nodes: usize) -> Option<NodeId> {
@@ -421,7 +421,7 @@ impl<'a> ModifyInputsContext<'a> {
 				.filter(|transform| transform.matrix2.determinant() != 0. && upstream_transform.matrix2.determinant() != 0.)
 				.is_some()
 			{
-				transform = transform * upstream_transform.inverse();
+				transform *= upstream_transform.inverse();
 			}
 			let final_transform = pivot.inverse() * to.inverse() * transform * pivot;
 			transform_utils::update_transform(inputs, final_transform);
@@ -804,7 +804,7 @@ fn import_usvg_node(modify_inputs: &mut ModifyInputsContext, node: &usvg::Node,
 	match node {
 		usvg::Node::Group(group) => {
 			for child in &group.children {
-				import_usvg_node(modify_inputs, &child, transform, NodeId(generate_uuid()), LayerNodeIdentifier::new_unchecked(layer), -1);
+				import_usvg_node(modify_inputs, child, transform, NodeId(generate_uuid()), LayerNodeIdentifier::new_unchecked(layer), -1);
 			}
 			modify_inputs.layer_node = Some(layer);
 		}

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

@@ -304,7 +304,7 @@ impl NodeGraphMessageHandler {
 			.collect::<Vec<_>>()
 	}
 
-	fn collect_nodes(&self, links: &Vec<FrontendNodeLink>, network: &NodeNetwork) -> Vec<FrontendNode> {
+	fn collect_nodes(&self, links: &[FrontendNodeLink], network: &NodeNetwork) -> Vec<FrontendNode> {
 		let connected_node_to_output_lookup = links.iter().map(|link| ((link.link_start, link.link_start_output_index), link.link_end)).collect::<HashMap<_, _>>();
 
 		let mut nodes = Vec::new();

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

@@ -1554,16 +1554,12 @@ pub fn transform_properties(document_node: &DocumentNode, node_id: NodeId, _cont
 		{
 			widgets.extend_from_slice(&[
 				Separator::new(SeparatorType::Unrelated).widget_holder(),
-				NumberInput::new(Some(val.to_degrees().into()))
+				NumberInput::new(Some(val.to_degrees()))
 					.unit("°")
 					.mode(NumberInputMode::Range)
 					.range_min(Some(-180.))
 					.range_max(Some(180.))
-					.on_update(update_value(
-						|number_input: &NumberInput| TaggedValue::F64((number_input.value.unwrap() as f64).to_radians()),
-						node_id,
-						index,
-					))
+					.on_update(update_value(|number_input: &NumberInput| TaggedValue::F64(number_input.value.unwrap().to_radians()), node_id, index))
 					.on_commit(commit_value)
 					.widget_holder(),
 			]);

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

@@ -92,7 +92,7 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 		let grid = grid.clone();
 		move |input: &I| {
 			let mut grid = grid.clone();
-			update(&mut grid, &input);
+			update(&mut grid, input);
 			DocumentMessage::GridOptions(grid).into()
 		}
 	}
@@ -113,14 +113,14 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 				.label("X")
 				.unit(" px")
 				.min_width(98)
-				.on_update(update_origin(&grid, |grid| Some(&mut grid.origin.x)))
+				.on_update(update_origin(grid, |grid| Some(&mut grid.origin.x)))
 				.widget_holder(),
 			Separator::new(SeparatorType::Related).widget_holder(),
 			NumberInput::new(Some(grid.origin.y))
 				.label("Y")
 				.unit(" px")
 				.min_width(98)
-				.on_update(update_origin(&grid, |grid| Some(&mut grid.origin.y)))
+				.on_update(update_origin(grid, |grid| Some(&mut grid.origin.y)))
 				.widget_holder(),
 		],
 	});
@@ -148,15 +148,15 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 					.unit(" px")
 					.min(0.)
 					.min_width(98)
-					.on_update(update_origin(&grid, |grid| grid.grid_type.rect_spacing().map(|spacing| &mut spacing.x)))
+					.on_update(update_origin(grid, |grid| grid.grid_type.rect_spacing().map(|spacing| &mut spacing.x)))
 					.widget_holder(),
 				Separator::new(SeparatorType::Related).widget_holder(),
 				NumberInput::new(Some(spacing.y))
 					.label("Y")
 					.unit(" px")
 					.min(0.)
 					.min_width(98)
-					.on_update(update_origin(&grid, |grid| grid.grid_type.rect_spacing().map(|spacing| &mut spacing.y)))
+					.on_update(update_origin(grid, |grid| grid.grid_type.rect_spacing().map(|spacing| &mut spacing.y)))
 					.widget_holder(),
 			],
 		}),
@@ -169,7 +169,7 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 						.unit(" px")
 						.min(0.)
 						.min_width(200)
-						.on_update(update_origin(&grid, |grid| grid.grid_type.isometric_y_spacing()))
+						.on_update(update_origin(grid, |grid| grid.grid_type.isometric_y_spacing()))
 						.widget_holder(),
 				],
 			});
@@ -180,13 +180,13 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
 					NumberInput::new(Some(angle_a))
 						.unit("°")
 						.min_width(98)
-						.on_update(update_origin(&grid, |grid| grid.grid_type.angle_a()))
+						.on_update(update_origin(grid, |grid| grid.grid_type.angle_a()))
 						.widget_holder(),
 					Separator::new(SeparatorType::Related).widget_holder(),
 					NumberInput::new(Some(angle_b))
 						.unit("°")
 						.min_width(98)
-						.on_update(update_origin(&grid, |grid| grid.grid_type.angle_b()))
+						.on_update(update_origin(grid, |grid| grid.grid_type.angle_b()))
 						.widget_holder(),
 				],
 			});

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

@@ -418,7 +418,7 @@ impl<'a> Selected<'a> {
 
 				match &self.original_transforms {
 					OriginalTransforms::Layer(layer_transforms) => Self::transform_layer(self.document_metadata, layer, layer_transforms.get(&layer), transformation, self.responses),
-					OriginalTransforms::Path(path_transforms) => Self::transform_path(&self.document_metadata, layer, path_transforms.get(&layer), transformation, self.responses),
+					OriginalTransforms::Path(path_transforms) => Self::transform_path(self.document_metadata, layer, path_transforms.get(&layer), transformation, self.responses),
 				}
 			}
 		}

editor/src/messages/tool/common_functionality/snapping/layer_snapper.rs

@@ -109,7 +109,7 @@ impl LayerSnapper {
 						target: path.target,
 						distance,
 						tolerance,
-						curves: [path.bounds.is_none().then(|| path.document_curve), None],
+						curves: [path.bounds.is_none().then_some(path.document_curve), None],
 						source: point.source,
 						target_bounds: path.bounds,
 						..Default::default()
@@ -148,7 +148,7 @@ impl LayerSnapper {
 							target: path.target,
 							distance,
 							tolerance,
-							curves: [path.bounds.is_none().then(|| path.document_curve), Some(constraint_path)],
+							curves: [path.bounds.is_none().then_some(path.document_curve), Some(constraint_path)],
 							source: point.source,
 							target_bounds: path.bounds,
 							at_intersection: true,
@@ -187,7 +187,7 @@ impl LayerSnapper {
 			}
 		}
 		for &layer in snap_data.get_candidates() {
-			get_layer_snap_points(layer, &snap_data, &mut self.points_to_snap);
+			get_layer_snap_points(layer, snap_data, &mut self.points_to_snap);
 
 			if snap_data.ignore_bounds(layer) {
 				continue;
@@ -219,7 +219,7 @@ impl LayerSnapper {
 					distance < best.distance
 				}
 			};
-			if distance < tolerance && (best.is_none() || best.as_ref().is_some_and(|best| candidate_better(best))) {
+			if distance < tolerance && (best.is_none() || best.as_ref().is_some_and(candidate_better)) {
 				best = Some(SnappedPoint {
 					snapped_point_document: candidate.document_point,
 					source: point.source,
@@ -318,7 +318,7 @@ impl SnapCandidatePoint {
 			document_point,
 			source,
 			target,
-			quad: quad,
+			quad,
 			..Default::default()
 		}
 	}
@@ -423,8 +423,8 @@ pub fn group_smooth(group: &bezier_rs::ManipulatorGroup<ManipulatorGroupId>, to_
 	let handle_in = group.in_handle.map(|handle| anchor - handle).filter(handle_not_under(to_document));
 	let handle_out = group.out_handle.map(|handle| handle - anchor).filter(handle_not_under(to_document));
 	let at_end = !subpath.closed() && (index == 0 || index == subpath.len() - 1);
-	let smooth = handle_in.is_some_and(|handle_in| handle_out.is_some_and(|handle_out| handle_in.angle_between(handle_out) < 1e-5)) && !at_end;
-	smooth
+
+	handle_in.is_some_and(|handle_in| handle_out.is_some_and(|handle_out| handle_in.angle_between(handle_out) < 1e-5)) && !at_end
 }
 pub fn get_layer_snap_points(layer: LayerNodeIdentifier, snap_data: &SnapData, points: &mut Vec<SnapCandidatePoint>) {
 	let document = snap_data.document;