Skip to content

Commit beb1c6a

Browse files
TrueDoctorKeavon
TrueDoctor
and
Keavon
authored
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]>
1 parent 927d7dd commit beb1c6a

File tree

253 files changed

+976
-1367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+976
-1367
lines changed

‎editor/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
name = "graphite-editor"
33
publish = false
44
version = "0.0.0"
5-
rust-version = "1.82"
5+
rust-version = "1.85"
66
authors = ["Graphite Authors <[email protected]>"]
7-
edition = "2021"
7+
edition = "2024"
88
readme = "../README.md"
99
homepage = "https://graphite.rs"
1010
repository = "https://github.com/GraphiteEditor/Graphite"

‎editor/src/application.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::dispatcher::Dispatcher;
22
use crate::messages::prelude::*;
3-
43
pub use graphene_core::uuid::*;
54

65
// TODO: serialize with serde to save the current editor state

‎editor/src/dispatcher.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,7 @@ impl Dispatcher {
303303
fn create_indents(queues: &[VecDeque<Message>]) -> String {
304304
String::from_iter(queues.iter().enumerate().skip(1).map(|(index, queue)| {
305305
if index == queues.len() - 1 {
306-
if queue.is_empty() {
307-
"└── "
308-
} else {
309-
"├── "
310-
}
306+
if queue.is_empty() { "└── " } else { "├── " }
311307
} else if queue.is_empty() {
312308
" "
313309
} else {

‎editor/src/macros.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/// ```
2626
///
2727
macro_rules! actions {
28-
($($v:expr),* $(,)?) => {{
28+
($($v:expr_2021),* $(,)?) => {{
2929
vec![$(vec![$v.into()]),*]
3030
}};
3131

@@ -42,7 +42,7 @@ macro_rules! actions {
4242
/// }
4343
/// ```
4444
macro_rules! advertise_actions {
45-
($($v:expr),* $(,)?) => {
45+
($($v:expr_2021),* $(,)?) => {
4646
fn actions(&self) -> $crate::utility_traits::ActionList {
4747
actions!($($v),*)
4848
}

‎editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
use crate::messages::layout::utility_types::widget_prelude::*;
22
use crate::messages::prelude::*;
3-
4-
use graph_craft::document::NodeId;
5-
63
use glam::{IVec2, UVec2};
4+
use graph_craft::document::NodeId;
75

86
/// A dialog to allow users to set some initial options about a new document.
97
#[derive(Debug, Clone, Default)]

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,18 @@ impl LayoutHolder for ComingSoonDialog {
2626

2727
if let Some(issue) = self.issue {
2828
let row2 = vec![TextLabel::new("But you can help build it! Visit its issue:").widget_holder()];
29-
let row3 = vec![TextButton::new(format!("GitHub Issue #{issue}"))
30-
.icon(Some("Website".into()))
31-
.flush(true)
32-
.on_update(move |_| {
33-
FrontendMessage::TriggerVisitLink {
34-
url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
35-
}
36-
.into()
37-
})
38-
.widget_holder()];
29+
let row3 = vec![
30+
TextButton::new(format!("GitHub Issue #{issue}"))
31+
.icon(Some("Website".into()))
32+
.flush(true)
33+
.on_update(move |_| {
34+
FrontendMessage::TriggerVisitLink {
35+
url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
36+
}
37+
.into()
38+
})
39+
.widget_holder(),
40+
];
3941

4042
rows.push(LayoutGroup::Row { widgets: row2 });
4143
rows.push(LayoutGroup::Row { widgets: row3 });

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ impl LayoutHolder for DemoArtworkDialog {
3232
.flat_map(|chunk| {
3333
fn make_dialog(name: &str, filename: &str) -> Message {
3434
DialogMessage::CloseDialogAndThen {
35-
followups: vec![FrontendMessage::TriggerFetchAndOpenDocument {
36-
name: name.to_string(),
37-
filename: filename.to_string(),
38-
}
39-
.into()],
35+
followups: vec![
36+
FrontendMessage::TriggerFetchAndOpenDocument {
37+
name: name.to_string(),
38+
filename: filename.to_string(),
39+
}
40+
.into(),
41+
],
4042
}
4143
.into()
4244
}

‎editor/src/messages/dialog/simple_dialogs/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ pub use about_graphite_dialog::AboutGraphiteDialog;
1010
pub use close_all_documents_dialog::CloseAllDocumentsDialog;
1111
pub use close_document_dialog::CloseDocumentDialog;
1212
pub use coming_soon_dialog::ComingSoonDialog;
13+
pub use demo_artwork_dialog::ARTWORK;
1314
pub use demo_artwork_dialog::DemoArtworkDialog;
1415
pub use error_dialog::ErrorDialog;
1516
pub use licenses_dialog::LicensesDialog;
16-
17-
pub use demo_artwork_dialog::ARTWORK;

‎editor/src/messages/frontend/frontend_message.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::messages::portfolio::document::node_graph::utility_types::{
66
use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, LayerPanelEntry, RawBuffer};
77
use crate::messages::prelude::*;
88
use crate::messages::tool::utility_types::HintData;
9-
109
use graph_craft::document::NodeId;
1110
use graphene_core::raster::color::Color;
1211
use graphene_core::text::Font;

‎editor/src/messages/globals/global_variables.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::messages::portfolio::utility_types::Platform;
2-
32
use std::sync::OnceLock;
43

54
pub static GLOBAL_PLATFORM: OnceLock<Platform> = OnceLock::new();

‎editor/src/messages/input_mapper/input_mapper_message_handler.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use super::utility_types::misc::Mapping;
33
use crate::messages::input_mapper::utility_types::input_keyboard::{self, Key};
44
use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
55
use crate::messages::prelude::*;
6-
76
use std::fmt::Write;
87

98
pub struct InputMapperMessageData<'a> {

‎editor/src/messages/input_mapper/input_mappings.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
1111
use crate::messages::prelude::*;
1212
use crate::messages::tool::tool_messages::brush_tool::BrushToolMessageOptionsUpdate;
1313
use crate::messages::tool::tool_messages::select_tool::SelectToolPointerKeys;
14-
1514
use glam::DVec2;
1615

1716
impl From<MappingVariant> for Mapping {

‎editor/src/messages/input_mapper/utility_types/input_keyboard.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
22
use crate::messages::prelude::*;
3-
43
use bitflags::bitflags;
5-
64
use std::fmt::{self, Display, Formatter};
75
use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign};
86

‎editor/src/messages/input_mapper/utility_types/input_mouse.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::consts::DRAG_THRESHOLD;
22
use crate::messages::prelude::*;
3-
43
use bitflags::bitflags;
54
use glam::DVec2;
65
use std::collections::VecDeque;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ macro_rules! modifiers {
2424
/// 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.
2525
/// When an action is currently available, and the user enters that input, the action's message is dispatched on the message bus.
2626
macro_rules! entry {
27-
($input:expr; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr$(,)?) => {
27+
($input:expr_2021; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr_2021$(,)?) => {
2828
&[&[
2929
// Cause the `action_dispatch` message to be sent when the specified input occurs.
3030
MappingEntry {
@@ -72,7 +72,7 @@ macro_rules! entry {
7272
/// (key_up, key_down, double_click, wheel_scroll, pointer_move)
7373
/// ```
7474
macro_rules! mapping {
75-
[$($entry:expr),* $(,)?] => {{
75+
[$($entry:expr_2021),* $(,)?] => {{
7676
let mut key_up = KeyMappingEntries::key_array();
7777
let mut key_down = KeyMappingEntries::key_array();
7878
let mut key_up_no_repeat = KeyMappingEntries::key_array();
@@ -107,7 +107,7 @@ macro_rules! mapping {
107107

108108
/// Constructs an `ActionKeys` macro with a certain `Action` variant, conveniently wrapped in `Some()`.
109109
macro_rules! action_keys {
110-
($action:expr) => {
110+
($action:expr_2021) => {
111111
Some(crate::messages::input_mapper::utility_types::misc::ActionKeys::Action($action.into()))
112112
};
113113
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use super::input_keyboard::{all_required_modifiers_pressed, Key, KeysGroup, LayoutKeysGroup};
1+
use super::input_keyboard::{Key, KeysGroup, LayoutKeysGroup, all_required_modifiers_pressed};
22
use crate::messages::input_mapper::key_mapping::MappingVariant;
33
use crate::messages::input_mapper::utility_types::input_keyboard::{KeyStates, NUMBER_OF_KEYS};
44
use crate::messages::input_mapper::utility_types::input_mouse::NUMBER_OF_MOUSE_BUTTONS;
55
use crate::messages::prelude::*;
6-
76
use core::time::Duration;
87

98
#[derive(Debug, Clone)]

‎editor/src/messages/input_preprocessor/input_preprocessor_message.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
22
use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, ViewportBounds};
33
use crate::messages::prelude::*;
4-
54
use core::time::Duration;
65

76
#[impl_message(Message, InputPreprocessor)]

‎editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::messages::input_mapper::utility_types::input_mouse::{MouseButton, Mou
33
use crate::messages::input_mapper::utility_types::misc::FrameTimeInfo;
44
use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
55
use crate::messages::prelude::*;
6-
76
use glam::DVec2;
87

98
pub struct InputPreprocessorMessageData {

‎editor/src/messages/layout/layout_message_handler.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
22
use crate::messages::layout::utility_types::widget_prelude::*;
33
use crate::messages::prelude::*;
4-
54
use graphene_core::raster::color::Color;
65
use graphene_core::text::Font;
76
use graphene_std::vector::style::{FillChoice, GradientStops};
8-
97
use serde_json::Value;
108

119
#[derive(Debug, Clone, Default)]

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::application::generate_uuid;
66
use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
77
use crate::messages::input_mapper::utility_types::misc::ActionKeys;
88
use crate::messages::prelude::*;
9-
109
use std::sync::Arc;
1110

1211
#[repr(transparent)]
@@ -348,11 +347,7 @@ impl LayoutGroup {
348347
val.clone_from(&tooltip);
349348
}
350349
}
351-
if is_col {
352-
Self::Column { widgets }
353-
} else {
354-
Self::Row { widgets }
355-
}
350+
if is_col { Self::Column { widgets } } else { Self::Row { widgets } }
356351
}
357352

358353
/// 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/button_widgets.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ use crate::messages::input_mapper::utility_types::misc::ActionKeys;
22
use crate::messages::layout::utility_types::widget_prelude::*;
33
use crate::messages::portfolio::document::node_graph::utility_types::FrontendGraphDataType;
44
use crate::messages::tool::tool_messages::tool_prelude::WidgetCallback;
5-
5+
use derivative::*;
66
use graphene_std::vector::style::FillChoice;
77
use graphite_proc_macros::WidgetBuilder;
88

9-
use derivative::*;
10-
119
#[derive(Clone, Default, Derivative, serde::Serialize, serde::Deserialize, WidgetBuilder, specta::Type)]
1210
#[derivative(Debug, PartialEq)]
1311
pub struct IconButton {

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
use crate::messages::input_mapper::utility_types::misc::ActionKeys;
22
use crate::messages::layout::utility_types::widget_prelude::*;
3-
4-
use graphene_core::{raster::curve::Curve, Color};
5-
use graphite_proc_macros::WidgetBuilder;
6-
73
use derivative::*;
84
use glam::DVec2;
5+
use graphene_core::Color;
6+
use graphene_core::raster::curve::Curve;
7+
use graphite_proc_macros::WidgetBuilder;
98

109
#[derive(Clone, Derivative, serde::Serialize, serde::Deserialize, WidgetBuilder, specta::Type)]
1110
#[derivative(Debug, PartialEq)]

‎editor/src/messages/layout/utility_types/widgets/menu_widgets.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
use super::input_widgets::InvisibleStandinInput;
12
use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
23
use crate::messages::input_mapper::utility_types::misc::ActionKeys;
34
use crate::messages::layout::utility_types::widget_prelude::*;
45
use crate::messages::prelude::*;
56

6-
use super::input_widgets::InvisibleStandinInput;
7-
87
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Default, specta::Type)]
98
pub struct MenuBarEntryChildren(pub Vec<Vec<MenuBarEntry>>);
109

‎editor/src/messages/message.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::messages::prelude::*;
2-
32
use graphite_proc_macros::*;
43

54
#[impl_message]

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ use crate::messages::portfolio::document::utility_types::document_metadata::Laye
55
use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, FlipAxis, GridSnapping};
66
use crate::messages::portfolio::utility_types::PanelType;
77
use crate::messages::prelude::*;
8-
8+
use glam::DAffine2;
99
use graph_craft::document::NodeId;
10+
use graphene_core::Color;
1011
use graphene_core::raster::BlendMode;
1112
use graphene_core::raster::Image;
1213
use graphene_core::vector::style::ViewMode;
13-
use graphene_core::Color;
1414
use graphene_std::renderer::ClickTarget;
1515
use graphene_std::transform::Footprint;
1616

17-
use glam::DAffine2;
18-
1917
#[impl_message(Message, PortfolioMessage, Document)]
2018
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
2119
pub enum DocumentMessage {

0 commit comments

Comments
 (0)