rust 2024 edition

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "terp"
 version = "0.1.2"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib", "lib"]

src/app.rs

@@ -1,16 +1,16 @@
 use bevy::{
+    DefaultPlugins,
     app::App,
     prelude::*,
     winit::{WakeUp, WinitPlugin},
-    DefaultPlugins,
 };
 
 #[cfg(target_arch = "wasm32")]
 use crate::webgpu;
 use crate::{
-    animation, camera, cli, draw, points,
+    AppState, animation, camera, cli, draw, points,
     project::{self, LoadProjectData},
-    ui, AppState,
+    ui,
 };
 
 pub enum AppPlugin {

src/camera.rs

@@ -4,7 +4,7 @@ use bevy::{
     render::{camera::Viewport, view::RenderLayers},
 };
 
-use crate::{ui::CameraLayout, Interpolated};
+use crate::{Interpolated, ui::CameraLayout};
 
 pub(crate) const SOURCE_LAYER: RenderLayers = RenderLayers::layer(1);
 pub(crate) const TARGET_LAYER: RenderLayers = RenderLayers::layer(2);

src/draw.rs

@@ -1,11 +1,11 @@
 use crate::{
+    AppState, Interpolated,
     animation::Animatable,
     camera::{SOURCE_LAYER, TARGET_LAYER},
     error_handler,
     points::{Points, PointsMaterial, PointsMeshBuilder, PointsSettings},
     project::LoadProject,
     util::window_position_to_world,
-    AppState, Interpolated,
 };
 use anyhow::Result;
 use bevy::{

src/points/mesh.rs

@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 
 use super::ATTRIBUTE_TARGET_POSITION;
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use bevy::{asset::RenderAssetUsages, prelude::*, render::mesh::VertexAttributeValues};
 use serde::{Deserialize, Serialize};
 
@@ -10,7 +10,7 @@ pub(crate) struct Points(pub Vec<Vec2>);
 
 impl Points {
     pub(crate) fn append(mesh: &mut Mesh, point: Vec2) {
-        if let Some(VertexAttributeValues::Float32x3(ref mut positions)) =
+        if let Some(VertexAttributeValues::Float32x3(positions)) =
             mesh.attribute_mut(Mesh::ATTRIBUTE_POSITION)
         {
             positions.reserve(3);
@@ -23,12 +23,12 @@ impl Points {
 
     // Merge target into source interpolated
     pub(crate) fn interpolate(source: &mut Mesh, target: &Mesh) {
-        let Some(VertexAttributeValues::Float32x3(ref mut source_positions)) =
+        let Some(VertexAttributeValues::Float32x3(source_positions)) =
             source.attribute_mut(Mesh::ATTRIBUTE_POSITION)
         else {
             return;
         };
-        let Some(VertexAttributeValues::Float32x3(ref target_positions)) =
+        let Some(VertexAttributeValues::Float32x3(target_positions)) =
             target.attribute(Mesh::ATTRIBUTE_POSITION)
         else {
             return;
@@ -241,7 +241,9 @@ mod tests {
     fn test_padding() {
         assert_eq!(
             Points::pad_positions(&[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4], 7 * 3),
-            vec![1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4,]
+            vec![
+                1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4,
+            ]
         );
         assert_eq!(
             Points::pad_positions(&[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4], 14 * 3),

src/ui.rs

@@ -1,4 +1,4 @@
-use crate::{draw::UndoEvent, AppState, Interpolated};
+use crate::{AppState, Interpolated, draw::UndoEvent};
 use bevy::{asset::embedded_asset, prelude::*, render::view::RenderLayers};
 
 mod brush_color;

src/ui/brush_color.rs

@@ -9,12 +9,12 @@ use bevy::{
 };
 
 use crate::{
+    AppState,
     draw::Brush,
     util::{window_position_to_world, window_to_world},
-    AppState,
 };
 
-use super::{ControlsCamera, CONTROLS_LAYER};
+use super::{CONTROLS_LAYER, ControlsCamera};
 
 const RADIUS: f32 = 50.0;
 

src/ui/brush_size.rs

@@ -1,12 +1,12 @@
 use bevy::{prelude::*, window::PrimaryWindow};
 
 use crate::{
+    AppState,
     draw::Brush,
     util::{window_position_to_world, window_to_world},
-    AppState,
 };
 
-use super::{ControlsCamera, CONTROLS_LAYER};
+use super::{CONTROLS_LAYER, ControlsCamera};
 
 #[derive(Component)]
 struct BrushSizeControl;