Upgrade to the Rust 2024 edition (#2367)

* Update to rust 2024 edition

* Fixes

* Clean up imports

* Cargo fmt again

---------

Co-authored-by: Keavon Chambers <[email protected]>

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/application.rs

@@ -1,6 +1,5 @@
 use crate::dispatcher::Dispatcher;
 use crate::messages::prelude::*;
-
 pub use graphene_core::uuid::*;
 
 // TODO: serialize with serde to save the current editor state

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/new_document_dialog/new_document_dialog_message_handler.rs

@@ -1,9 +1,7 @@
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
-
-use graph_craft::document::NodeId;
-
 use glam::{IVec2, UVec2};
+use graph_craft::document::NodeId;
 
 /// A dialog to allow users to set some initial options about a new document.
 #[derive(Debug, Clone, Default)]

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/dialog/simple_dialogs/mod.rs

@@ -10,8 +10,7 @@ pub use about_graphite_dialog::AboutGraphiteDialog;
 pub use close_all_documents_dialog::CloseAllDocumentsDialog;
 pub use close_document_dialog::CloseDocumentDialog;
 pub use coming_soon_dialog::ComingSoonDialog;
+pub use demo_artwork_dialog::ARTWORK;
 pub use demo_artwork_dialog::DemoArtworkDialog;
 pub use error_dialog::ErrorDialog;
 pub use licenses_dialog::LicensesDialog;
-
-pub use demo_artwork_dialog::ARTWORK;

editor/src/messages/frontend/frontend_message.rs

@@ -6,7 +6,6 @@ use crate::messages::portfolio::document::node_graph::utility_types::{
 use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, LayerPanelEntry, RawBuffer};
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
-
 use graph_craft::document::NodeId;
 use graphene_core::raster::color::Color;
 use graphene_core::text::Font;

editor/src/messages/globals/global_variables.rs

@@ -1,5 +1,4 @@
 use crate::messages::portfolio::utility_types::Platform;
-
 use std::sync::OnceLock;
 
 pub static GLOBAL_PLATFORM: OnceLock<Platform> = OnceLock::new();