Upgrade to the Rust 2024 edition (#2367)

* Update to rust 2024 edition

* Fixes

* Clean up imports

* Cargo fmt again

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>

editor/src/messages/tool/common_functionality/color_selector.rs

@@ -1,7 +1,6 @@
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
-
 use graphene_core::Color;
 use graphene_std::vector::style::FillChoice;
 

editor/src/messages/tool/common_functionality/compass_rose.rs

@@ -1,7 +1,6 @@
 use crate::consts::{COMPASS_ROSE_ARROW_CLICK_TARGET_ANGLE, COMPASS_ROSE_HOVER_RING_DIAMETER, COMPASS_ROSE_RING_INNER_DIAMETER};
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::DocumentMessageHandler;
-
 use glam::{DAffine2, DVec2};
 use std::f64::consts::FRAC_PI_2;
 

editor/src/messages/tool/common_functionality/graph_modification_utils.rs

@@ -3,18 +3,17 @@ use crate::messages::portfolio::document::node_graph::document_node_definitions;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, InputConnector, NodeNetworkInterface, NodeTemplate};
 use crate::messages::prelude::*;
-
 use bezier_rs::Subpath;
+use glam::DVec2;
 use graph_craft::concrete;
-use graph_craft::document::{value::TaggedValue, NodeId, NodeInput};
-use graphene_core::raster::image::ImageFrameTable;
+use graph_craft::document::value::TaggedValue;
+use graph_craft::document::{NodeId, NodeInput};
+use graphene_core::Color;
 use graphene_core::raster::BlendMode;
+use graphene_core::raster::image::ImageFrameTable;
 use graphene_core::text::{Font, TypesettingConfig};
 use graphene_core::vector::style::Gradient;
-use graphene_core::Color;
 use graphene_std::vector::{ManipulatorPointId, PointId, SegmentId, VectorModificationType};
-
-use glam::DVec2;
 use std::collections::VecDeque;
 
 /// Returns the ID of the first Spline node in the horizontal flow which is not followed by a `Path` node, or `None` if none exists.
@@ -385,7 +384,7 @@ impl<'a> NodeGraphLayer<'a> {
 	}
 
 	/// Return an iterator up the horizontal flow of the layer
-	pub fn horizontal_layer_flow(&self) -> impl Iterator<Item = NodeId> + 'a {
+	pub fn horizontal_layer_flow(&self) -> impl Iterator<Item = NodeId> + use<'a> {
 		self.network_interface.upstream_flow_back_from_nodes(vec![self.layer_node], &[], FlowType::HorizontalFlow)
 	}
 

editor/src/messages/tool/common_functionality/pivot.rs

@@ -6,7 +6,6 @@ use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
-
 use glam::{DAffine2, DVec2};
 use std::collections::VecDeque;
 

editor/src/messages/tool/common_functionality/resize.rs

@@ -1,7 +1,8 @@
+use crate::messages::input_mapper::utility_types::input_keyboard::Key;
+use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
 use crate::messages::tool::common_functionality::snapping::{SnapCandidatePoint, SnapConstraint, SnapData, SnapManager, SnapTypeConfiguration};
-use crate::messages::{input_mapper::utility_types::input_keyboard::Key, portfolio::document::graph_operation::utility_types::TransformIn};
 use glam::{DAffine2, DVec2, Vec2Swizzles};
 
 #[derive(Clone, Debug, Default)]

editor/src/messages/tool/common_functionality/shape_editor.rs

@@ -6,12 +6,10 @@ use crate::messages::portfolio::document::utility_types::network_interface::Node
 use crate::messages::prelude::*;
 use crate::messages::tool::common_functionality::snapping::SnapTypeConfiguration;
 use crate::messages::tool::tool_messages::path_tool::PointSelectState;
-
 use bezier_rs::{Bezier, BezierHandles, Subpath, TValue};
+use glam::{DAffine2, DVec2};
 use graphene_core::transform::Transform;
 use graphene_core::vector::{ManipulatorPointId, PointId, VectorData, VectorModificationType};
-
-use glam::{DAffine2, DVec2};
 use graphene_std::vector::{HandleId, SegmentId};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -586,7 +584,7 @@ impl ShapeState {
 			.flat_map(|(data, selection_state)| {
 				selection_state.selected_points.iter().filter_map(move |&point| {
 					let Some(data) = &data else { return None };
-					let Some(_) = point.get_handle_pair(&data) else { return None }; // ignores the endpoints.
+					let _ = point.get_handle_pair(data)?; // ignores the endpoints.
 					Some(data.colinear(point))
 				})
 			});
@@ -1289,10 +1287,13 @@ impl ShapeState {
 
 			for point in self.selected_points().filter(|point| point.as_handle().is_some()) {
 				let anchor = point.get_anchor(&vector_data);
-				if let Some(handles) = point.get_handle_pair(&vector_data) {
-					points_to_select.push((layer, anchor, Some(handles[1].to_manipulator_point())));
-				} else {
-					points_to_select.push((layer, anchor, None));
+				match point.get_handle_pair(&vector_data) {
+					Some(handles) => {
+						points_to_select.push((layer, anchor, Some(handles[1].to_manipulator_point())));
+					}
+					_ => {
+						points_to_select.push((layer, anchor, None));
+					}
 				}
 			}
 		}

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

@@ -3,21 +3,23 @@ mod distribution_snapper;
 mod grid_snapper;
 mod layer_snapper;
 mod snap_results;
-pub use {alignment_snapper::*, distribution_snapper::*, grid_snapper::*, layer_snapper::*, snap_results::*};
 
 use crate::consts::{COLOR_OVERLAY_BLUE, COLOR_OVERLAY_LABEL_BACKGROUND, COLOR_OVERLAY_WHITE};
 use crate::messages::portfolio::document::overlays::utility_types::{OverlayContext, Pivot};
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::misc::{GridSnapTarget, PathSnapTarget, SnapTarget};
 use crate::messages::prelude::*;
-
+pub use alignment_snapper::*;
 use bezier_rs::TValue;
+pub use distribution_snapper::*;
+use glam::{DAffine2, DVec2};
 use graphene_core::renderer::Quad;
 use graphene_core::vector::PointId;
 use graphene_std::renderer::Rect;
-
-use glam::{DAffine2, DVec2};
 use graphene_std::vector::NoHashBuilder;
+pub use grid_snapper::*;
+pub use layer_snapper::*;
+pub use snap_results::*;
 use std::cmp::Ordering;
 
 /// Configuration for the relevant snap type

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

@@ -1,9 +1,7 @@
 use super::*;
 use crate::messages::portfolio::document::utility_types::misc::*;
-
-use graphene_core::renderer::Quad;
-
 use glam::{DAffine2, DVec2};
+use graphene_core::renderer::Quad;
 
 #[derive(Clone, Debug, Default)]
 pub struct AlignmentSnapper {

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

@@ -2,10 +2,8 @@ use super::*;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::misc::*;
 use crate::messages::prelude::*;
-
-use graphene_core::renderer::Quad;
-
 use glam::DVec2;
+use graphene_core::renderer::Quad;
 
 #[derive(Clone, Debug, Default)]
 pub struct DistributionSnapper {

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

@@ -1,7 +1,5 @@
 use super::*;
-
 use crate::messages::portfolio::document::utility_types::misc::{GridSnapTarget, GridSnapping, GridType, SnapTarget};
-
 use glam::DVec2;
 use graphene_core::renderer::Quad;
 

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

@@ -3,13 +3,11 @@ use crate::consts::HIDE_HANDLE_DISTANCE;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::misc::*;
 use crate::messages::prelude::*;
-
 use bezier_rs::{Bezier, Identifier, Subpath, TValue};
+use glam::{DAffine2, DVec2};
 use graphene_core::renderer::Quad;
 use graphene_core::vector::PointId;
 
-use glam::{DAffine2, DVec2};
-
 #[derive(Clone, Debug, Default)]
 pub struct LayerSnapper {
 	points_to_snap: Vec<SnapCandidatePoint>,

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

@@ -1,5 +1,4 @@
-use std::collections::VecDeque;
-
+use super::DistributionMatch;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::misc::{DistributionSnapTarget, SnapSource, SnapTarget};
 use crate::messages::tool::common_functionality::snapping::SnapCandidatePoint;
@@ -8,8 +7,7 @@ use glam::DVec2;
 use graphene_core::renderer::Quad;
 use graphene_core::vector::PointId;
 use graphene_std::renderer::Rect;
-
-use super::DistributionMatch;
+use std::collections::VecDeque;
 
 #[derive(Clone, Debug, Default)]
 pub struct SnapResults {

editor/src/messages/tool/common_functionality/transformation_cage.rs

@@ -1,3 +1,4 @@
+use super::snapping::{self, SnapCandidatePoint, SnapConstraint, SnapData, SnapManager, SnappedPoint};
 use crate::consts::{
 	BOUNDS_ROTATE_THRESHOLD, BOUNDS_SELECT_THRESHOLD, COLOR_OVERLAY_WHITE, MAXIMUM_ALT_SCALE_FACTOR, MIN_LENGTH_FOR_CORNERS_VISIBILITY, MIN_LENGTH_FOR_EDGE_RESIZE_PRIORITY_OVER_CORNERS,
 	MIN_LENGTH_FOR_MIDPOINT_VISIBILITY, MIN_LENGTH_FOR_RESIZE_TO_INCLUDE_INTERIOR, MIN_LENGTH_FOR_SKEW_TRIANGLE_VISIBILITY, RESIZE_HANDLE_SIZE, SELECTION_DRAG_ANGLE, SKEW_TRIANGLE_OFFSET,
@@ -8,14 +9,10 @@ use crate::messages::portfolio::document::overlays::utility_types::OverlayContex
 use crate::messages::portfolio::document::utility_types::transformation::OriginalTransforms;
 use crate::messages::prelude::*;
 use crate::messages::tool::common_functionality::snapping::SnapTypeConfiguration;
-
+use glam::{DAffine2, DMat2, DVec2};
 use graphene_core::renderer::Quad;
 use graphene_std::renderer::Rect;
 
-use glam::{DAffine2, DMat2, DVec2};
-
-use super::snapping::{self, SnapCandidatePoint, SnapConstraint, SnapData, SnapManager, SnappedPoint};
-
 /// (top, bottom, left, right)
 pub type EdgeBool = (bool, bool, bool, bool);
 

editor/src/messages/tool/common_functionality/utility_functions.rs

@@ -1,12 +1,10 @@
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
 use crate::messages::tool::common_functionality::graph_modification_utils::get_text;
-
-use graphene_core::renderer::Quad;
-use graphene_core::text::{load_face, FontCache};
-use graphene_std::vector::PointId;
-
 use glam::DVec2;
+use graphene_core::renderer::Quad;
+use graphene_core::text::{FontCache, load_face};
+use graphene_std::vector::PointId;
 
 /// Determines if a path should be extended. Goal in viewport space. Returns the path and if it is extending from the start, if applicable.
 pub fn should_extend(