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>

node-graph/gstd/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "graphene-std"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 description = "Graphene standard library"
 authors = ["Graphite Authors <contact@graphite.rs>"]
 license = "MIT OR Apache-2.0"

node-graph/gstd/src/any.rs

@@ -1,10 +1,10 @@
 use dyn_any::StaticType;
 pub use graph_craft::proto::{Any, NodeContainer, TypeErasedBox, TypeErasedNode};
 use graph_craft::proto::{DynFuture, FutureAny, SharedNodeContainer};
-pub use graphene_core::registry::{DowncastBothNode, DynAnyNode, FutureWrapperNode, PanicNode};
 use graphene_core::NodeIO;
 use graphene_core::WasmNotSend;
-pub use graphene_core::{generic, ops, Node};
+pub use graphene_core::registry::{DowncastBothNode, DynAnyNode, FutureWrapperNode, PanicNode};
+pub use graphene_core::{Node, generic, ops};
 
 pub trait IntoTypeErasedNode<'n> {
 	fn into_type_erased(self) -> TypeErasedBox<'n>;

node-graph/gstd/src/brush.rs

@@ -1,5 +1,5 @@
-use crate::raster::{blend_image_closure, BlendImageTupleNode, ExtendImageToBoundsNode};
-
+use crate::raster::{BlendImageTupleNode, ExtendImageToBoundsNode, blend_image_closure};
+use glam::{DAffine2, DVec2};
 use graph_craft::generic::FnNode;
 use graph_craft::proto::FutureWrapperNode;
 use graphene_core::raster::adjustments::blend_colors;
@@ -9,12 +9,10 @@ use graphene_core::raster::image::{Image, ImageFrameTable};
 use graphene_core::raster::{Alpha, Bitmap, BlendMode, Color, Pixel, Sample};
 use graphene_core::transform::{Transform, TransformMut};
 use graphene_core::value::{ClonedNode, CopiedNode, ValueNode};
-use graphene_core::vector::brush_stroke::{BrushStroke, BrushStyle};
 use graphene_core::vector::VectorDataTable;
+use graphene_core::vector::brush_stroke::{BrushStroke, BrushStyle};
 use graphene_core::{Ctx, GraphicElement, Node};
 
-use glam::{DAffine2, DVec2};
-
 #[node_macro::node(category("Debug"))]
 fn vector_points(_: impl Ctx, vector_data: VectorDataTable) -> Vec<DVec2> {
 	let vector_data = vector_data.one_instance().instance;
@@ -335,12 +333,10 @@ async fn brush(_: impl Ctx, image_frame_table: ImageFrameTable<Color>, bounds: I
 #[cfg(test)]
 mod test {
 	use super::*;
-
+	use glam::DAffine2;
 	use graphene_core::raster::Bitmap;
 	use graphene_core::transform::Transform;
 
-	use glam::DAffine2;
-
 	#[test]
 	fn test_brush_texture() {
 		let size = 20.;

node-graph/gstd/src/cache.rs

@@ -1,14 +1,12 @@
 use parking_lot::RawRwLock;
-use std::{
-	any::Any,
-	borrow::Borrow,
-	cell::RefCell,
-	collections::{hash_map::DefaultHasher, HashMap},
-	hash::{Hash, Hasher},
-	iter,
-	iter::Sum,
-	marker::PhantomData,
-};
+use std::any::Any;
+use std::borrow::Borrow;
+use std::cell::RefCell;
+use std::collections::hash_map::DefaultHasher;
+use std::collections::HashMap;
+use std::hash::{Hash, Hasher};
+use std::iter::{self, Sum};
+use std::marker::PhantomData;
 use storage_map::{StorageMap, StorageMapGuard};
 
 /// Caches the output of a given Node and acts as a proxy
@@ -21,8 +19,16 @@ impl<'n: 'c, 'c, NODE: Node + 'c> Node for SmartCacheNode<'n, 'c, NODE>
 where
 	for<'a> NODE::Input<'a>: Hash,
 {
-	type Input<'a> = NODE::Input<'a> where Self: 'a, 'c : 'a;
-	type Output<'a> = StorageMapGuard<'a, RawRwLock, CacheNode<'n, 'c, NODE>> where Self: 'a, 'c: 'a;
+	type Input<'a>
+		= NODE::Input<'a>
+	where
+		Self: 'a,
+		'c: 'a;
+	type Output<'a>
+		= StorageMapGuard<'a, RawRwLock, CacheNode<'n, 'c, NODE>>
+	where
+		Self: 'a,
+		'c: 'a;
 	fn eval<'a, I: Borrow<Self::Input<'a>>>(&'a self, input: I) -> Self::Output<'a> {
 		let mut hasher = DefaultHasher::new();
 		input.borrow().hash(&mut hasher);

node-graph/gstd/src/dehaze.rs

@@ -2,7 +2,6 @@ use graph_craft::proto::types::Percentage;
 use graphene_core::raster::image::{Image, ImageFrameTable};
 use graphene_core::transform::{Transform, TransformMut};
 use graphene_core::{Color, Ctx};
-
 use image::{DynamicImage, GenericImage, GenericImageView, GrayImage, ImageBuffer, Luma, Rgba, RgbaImage};
 use ndarray::{Array2, ArrayBase, Dim, OwnedRepr};
 use std::cmp::{max, min};

node-graph/gstd/src/gpu_nodes.rs

@@ -1,4 +1,6 @@
+use crate::wasm_application_io::WasmApplicationIo;
 use dyn_any::StaticTypeSized;
+use glam::{DAffine2, DVec2, Mat2, Vec2};
 use gpu_executor::{ComputePassDimensions, StorageBufferOptions};
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::*;
@@ -9,14 +11,9 @@ use graphene_core::raster::{BlendMode, Pixel};
 use graphene_core::transform::Transform;
 use graphene_core::transform::TransformMut;
 use graphene_core::*;
-use wgpu_executor::{Bindgroup, PipelineLayout, Shader, ShaderIO, ShaderInput, WgpuExecutor, WgpuShaderInput};
-
-use glam::{DAffine2, DVec2, Mat2, Vec2};
-
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
-
-use crate::wasm_application_io::WasmApplicationIo;
+use wgpu_executor::{Bindgroup, PipelineLayout, Shader, ShaderIO, ShaderInput, WgpuExecutor, WgpuShaderInput};
 
 // TODO: Move to graph-craft
 #[node_macro::node(category("Debug: GPU"))]

node-graph/gstd/src/image_color_palette.rs

@@ -29,7 +29,7 @@ async fn image_color_palette(
 		colors[bin].push(pixel.to_gamma_srgb());
 	}
 
-	let shorted = histogram.iter().enumerate().filter(|(_, &count)| count > 0).map(|(i, _)| i).collect::<Vec<usize>>();
+	let shorted = histogram.iter().enumerate().filter(|&(_, &count)| count > 0).map(|(i, _)| i).collect::<Vec<usize>>();
 
 	let mut palette = vec![];
 
@@ -64,7 +64,6 @@ async fn image_color_palette(
 #[cfg(test)]
 mod test {
 	use super::*;
-
 	use graphene_core::raster::image::{Image, ImageFrameTable};
 
 	#[test]

node-graph/gstd/src/imaginate.rs

@@ -1,7 +1,8 @@
 use crate::wasm_application_io::WasmEditorApi;
 use core::any::TypeId;
 use core::future::Future;
-use futures::{future::Either, TryFutureExt};
+use futures::TryFutureExt;
+use futures::future::Either;
 use glam::{DVec2, U64Vec2};
 use graph_craft::imaginate_input::{ImaginateController, ImaginateMaskStartingFill, ImaginateSamplingMethod, ImaginateServerStatus, ImaginateStatus, ImaginateTerminationHandle};
 use graph_craft::wasm_application_io::EditorPreferences;

node-graph/gstd/src/raster.rs

@@ -1,4 +1,6 @@
 use dyn_any::DynAny;
+use fastnoise_lite;
+use glam::{DAffine2, DVec2, Vec2};
 use graphene_core::raster::bbox::Bbox;
 use graphene_core::raster::image::{Image, ImageFrameTable};
 use graphene_core::raster::{
@@ -6,9 +8,6 @@ use graphene_core::raster::{
 };
 use graphene_core::transform::{Transform, TransformMut};
 use graphene_core::{AlphaBlending, Color, Ctx, ExtractFootprint, GraphicElement, Node};
-
-use fastnoise_lite;
-use glam::{DAffine2, DVec2, Vec2};
 use rand::prelude::*;
 use rand_chacha::ChaCha8Rng;
 use std::fmt::Debug;

node-graph/gstd/src/text.rs

@@ -1,9 +1,8 @@
 use crate::vector::{VectorData, VectorDataTable};
-
 use graph_craft::wasm_application_io::WasmEditorApi;
-use graphene_core::text::TypesettingConfig;
-pub use graphene_core::text::{bounding_box, load_face, to_path, Font, FontCache};
 use graphene_core::Ctx;
+use graphene_core::text::TypesettingConfig;
+pub use graphene_core::text::{Font, FontCache, bounding_box, load_face, to_path};
 
 #[node_macro::node(category(""))]
 fn text<'i: 'n>(

node-graph/gstd/src/value.rs

@@ -1,7 +1,6 @@
 use core::marker::PhantomData;
 pub use graphene_core::value::*;
 use graphene_core::Node;
-
 use dyn_any::DynAny;
 
 pub struct AnyRefNode<'n, N: Node<'n>>(N, PhantomData<&'n ()>);

node-graph/gstd/src/vector.rs

@@ -1,4 +1,5 @@
 use bezier_rs::{ManipulatorGroup, Subpath};
+use glam::{DAffine2, DVec2};
 use graphene_core::transform::Transform;
 use graphene_core::transform::TransformMut;
 use graphene_core::vector::misc::BooleanOperation;
@@ -7,8 +8,6 @@ pub use graphene_core::vector::*;
 use graphene_core::{Color, Ctx, GraphicElement, GraphicGroupTable};
 pub use path_bool as path_bool_lib;
 use path_bool::{FillRule, PathBooleanOperation};
-
-use glam::{DAffine2, DVec2};
 use std::ops::Mul;
 
 #[node_macro::node(category(""))]

node-graph/gstd/src/wasm_application_io.rs

@@ -10,7 +10,7 @@ use graphene_core::instances::Instances;
 use graphene_core::raster::bbox::Bbox;
 use graphene_core::raster::image::{Image, ImageFrameTable};
 use graphene_core::renderer::RenderMetadata;
-use graphene_core::renderer::{format_transform_matrix, GraphicElementRendered, RenderParams, RenderSvgSegmentList, SvgRender};
+use graphene_core::renderer::{GraphicElementRendered, RenderParams, RenderSvgSegmentList, SvgRender, format_transform_matrix};
 use graphene_core::transform::Footprint;
 #[cfg(target_arch = "wasm32")]
 use graphene_core::transform::TransformMut;