Update to rust 2024 edition

Author: TrueDoctor

editor/Cargo.toml

@@ -2,9 +2,9 @@
 name = "graphite-editor"
 publish = false
 version = "0.0.0"
-rust-version = "1.82"
+rust-version = "1.85"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2021"
+edition = "2024"
 readme = "../README.md"
 homepage = "https://graphite.rs"
 repository = "https://github.com/GraphiteEditor/Graphite"

editor/src/dispatcher.rs

@@ -303,11 +303,7 @@ impl Dispatcher {
 	fn create_indents(queues: &[VecDeque<Message>]) -> String {
 		String::from_iter(queues.iter().enumerate().skip(1).map(|(index, queue)| {
 			if index == queues.len() - 1 {
-				if queue.is_empty() {
-					"└── "
-				} else {
-					"├── "
-				}
+				if queue.is_empty() { "└── " } else { "├── " }
 			} else if queue.is_empty() {
 				"   "
 			} else {

editor/src/macros.rs

@@ -25,7 +25,7 @@
 /// ```
 ///
 macro_rules! actions {
-	($($v:expr),* $(,)?) => {{
+	($($v:expr_2021),* $(,)?) => {{
 		vec![$(vec![$v.into()]),*]
 	}};
 
@@ -42,7 +42,7 @@ macro_rules! actions {
 /// }
 /// ```
 macro_rules! advertise_actions {
-	($($v:expr),* $(,)?) => {
+	($($v:expr_2021),* $(,)?) => {
 		fn actions(&self) -> $crate::utility_traits::ActionList {
 			actions!($($v),*)
 		}

editor/src/messages/dialog/simple_dialogs/coming_soon_dialog.rs

@@ -26,16 +26,18 @@ impl LayoutHolder for ComingSoonDialog {
 
 		if let Some(issue) = self.issue {
 			let row2 = vec![TextLabel::new("But you can help build it! Visit its issue:").widget_holder()];
-			let row3 = vec![TextButton::new(format!("GitHub Issue #{issue}"))
-				.icon(Some("Website".into()))
-				.flush(true)
-				.on_update(move |_| {
-					FrontendMessage::TriggerVisitLink {
-						url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
-					}
-					.into()
-				})
-				.widget_holder()];
+			let row3 = vec![
+				TextButton::new(format!("GitHub Issue #{issue}"))
+					.icon(Some("Website".into()))
+					.flush(true)
+					.on_update(move |_| {
+						FrontendMessage::TriggerVisitLink {
+							url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
+						}
+						.into()
+					})
+					.widget_holder(),
+			];
 
 			rows.push(LayoutGroup::Row { widgets: row2 });
 			rows.push(LayoutGroup::Row { widgets: row3 });

editor/src/messages/dialog/simple_dialogs/demo_artwork_dialog.rs

@@ -32,11 +32,13 @@ impl LayoutHolder for DemoArtworkDialog {
 			.flat_map(|chunk| {
 				fn make_dialog(name: &str, filename: &str) -> Message {
 					DialogMessage::CloseDialogAndThen {
-						followups: vec![FrontendMessage::TriggerFetchAndOpenDocument {
-							name: name.to_string(),
-							filename: filename.to_string(),
-						}
-						.into()],
+						followups: vec![
+							FrontendMessage::TriggerFetchAndOpenDocument {
+								name: name.to_string(),
+								filename: filename.to_string(),
+							}
+							.into(),
+						],
 					}
 					.into()
 				}

editor/src/messages/input_mapper/utility_types/macros.rs

@@ -24,7 +24,7 @@ macro_rules! modifiers {
 /// Each handler adds or removes actions in the form of message discriminants. Here, we tie an input condition (such as a hotkey) to an action's full message.
 /// When an action is currently available, and the user enters that input, the action's message is dispatched on the message bus.
 macro_rules! entry {
-	($input:expr; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr$(,)?) => {
+	($input:expr_2021; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr_2021$(,)?) => {
 		&[&[
 			// Cause the `action_dispatch` message to be sent when the specified input occurs.
 			MappingEntry {
@@ -72,7 +72,7 @@ macro_rules! entry {
 /// (key_up, key_down, double_click, wheel_scroll, pointer_move)
 /// ```
 macro_rules! mapping {
-	[$($entry:expr),* $(,)?] => {{
+	[$($entry:expr_2021),* $(,)?] => {{
 		let mut key_up = KeyMappingEntries::key_array();
 		let mut key_down = KeyMappingEntries::key_array();
 		let mut key_up_no_repeat = KeyMappingEntries::key_array();
@@ -107,7 +107,7 @@ macro_rules! mapping {
 
 /// Constructs an `ActionKeys` macro with a certain `Action` variant, conveniently wrapped in `Some()`.
 macro_rules! action_keys {
-	($action:expr) => {
+	($action:expr_2021) => {
 		Some(crate::messages::input_mapper::utility_types::misc::ActionKeys::Action($action.into()))
 	};
 }

editor/src/messages/input_mapper/utility_types/misc.rs

@@ -1,4 +1,4 @@
-use super::input_keyboard::{all_required_modifiers_pressed, Key, KeysGroup, LayoutKeysGroup};
+use super::input_keyboard::{Key, KeysGroup, LayoutKeysGroup, all_required_modifiers_pressed};
 use crate::messages::input_mapper::key_mapping::MappingVariant;
 use crate::messages::input_mapper::utility_types::input_keyboard::{KeyStates, NUMBER_OF_KEYS};
 use crate::messages::input_mapper::utility_types::input_mouse::NUMBER_OF_MOUSE_BUTTONS;

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

@@ -348,11 +348,7 @@ impl LayoutGroup {
 				val.clone_from(&tooltip);
 			}
 		}
-		if is_col {
-			Self::Column { widgets }
-		} else {
-			Self::Row { widgets }
-		}
+		if is_col { Self::Column { widgets } } else { Self::Row { widgets } }
 	}
 
 	/// Diffing updates self (where self is old) based on new, updating the list of modifications as it does so.

editor/src/messages/layout/utility_types/widgets/input_widgets.rs

@@ -1,7 +1,7 @@
 use crate::messages::input_mapper::utility_types::misc::ActionKeys;
 use crate::messages::layout::utility_types::widget_prelude::*;
 
-use graphene_core::{raster::curve::Curve, Color};
+use graphene_core::{Color, raster::curve::Curve};
 use graphite_proc_macros::WidgetBuilder;
 
 use derivative::*;

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

@@ -7,10 +7,10 @@ use crate::messages::portfolio::utility_types::PanelType;
 use crate::messages::prelude::*;
 
 use graph_craft::document::NodeId;
+use graphene_core::Color;
 use graphene_core::raster::BlendMode;
 use graphene_core::raster::Image;
 use graphene_core::vector::style::ViewMode;
-use graphene_core::Color;
 use graphene_std::renderer::ClickTarget;
 use graphene_std::transform::Footprint;