chore: update to edition 2024 (#126)

simbleau · web-flow · commit b2cd015a3899 · 2025-02-26T18:21:28.000Z
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,8 +18,9 @@ members = [
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "0.7.0"
+rust-version = "1.85"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/linebender/bevy_vello"
 
diff --git a/examples/cube3d/src/main.rs b/examples/cube3d/src/main.rs
@@ -1,17 +1,17 @@
 use bevy::{
     prelude::*,
     render::{
+        Render, RenderApp, RenderSet,
         extract_component::{ExtractComponent, ExtractComponentPlugin},
         render_asset::RenderAssets,
         render_resource::{
             Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
         },
         renderer::{RenderDevice, RenderQueue},
         texture::GpuImage,
-        Render, RenderApp, RenderSet,
     },
 };
-use bevy_vello::{prelude::*, render::VelloRenderer, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*, render::VelloRenderer};
 
 #[derive(Component)]
 pub struct VelloTarget(Handle<Image>);
diff --git a/examples/diagnostics/src/main.rs b/examples/diagnostics/src/main.rs
@@ -1,7 +1,8 @@
 use bevy::{diagnostic::DiagnosticsStore, prelude::*};
 use bevy_vello::{
-    diagnostics::VelloEntityCountDiagnosticsPlugin,
-    diagnostics::VelloFrameProfileDiagnosticsPlugin, prelude::*, VelloPlugin,
+    VelloPlugin,
+    diagnostics::{VelloEntityCountDiagnosticsPlugin, VelloFrameProfileDiagnosticsPlugin},
+    prelude::*,
 };
 
 const SCENE_COUNT: usize = 5;
diff --git a/examples/drag_n_drop/src/main.rs b/examples/drag_n_drop/src/main.rs
@@ -1,10 +1,10 @@
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     color::palettes::css::RED,
     prelude::*,
 };
 use bevy_async_task::AsyncTaskRunner;
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 use std::{ffi::OsStr, task::Poll};
 
 const NORMAL_BUTTON: Color = Color::srgb(0.15, 0.15, 0.15);
@@ -167,10 +167,10 @@ fn cleanup_scene(
     query_lottie: Option<Single<Entity, With<VelloLottieHandle>>>,
     query_svg: Option<Single<Entity, With<VelloSvgHandle>>>,
 ) {
-    if let Some(ref svg) = query_svg {
-        commands.entity(**svg).despawn();
+    if let Some(svg) = query_svg {
+        commands.entity(*svg).despawn();
     }
-    if let Some(ref lottie) = query_lottie {
-        commands.entity(**lottie).despawn();
+    if let Some(lottie) = query_lottie {
+        commands.entity(*lottie).despawn();
     }
 }
diff --git a/examples/headless/src/main.rs b/examples/headless/src/main.rs
@@ -1,8 +1,8 @@
 use bevy::{
     prelude::*,
-    render::view::screenshot::{save_to_disk, Screenshot, ScreenshotCaptured},
+    render::view::screenshot::{Screenshot, ScreenshotCaptured, save_to_disk},
 };
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/lottie/src/main.rs b/examples/lottie/src/main.rs
@@ -1,8 +1,8 @@
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     prelude::*,
 };
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/lottie_player/src/main.rs b/examples/lottie_player/src/main.rs
@@ -1,12 +1,12 @@
 mod ui;
 
 use bevy::{
-    asset::{embedded_asset, io::embedded::EmbeddedAssetRegistry, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset, io::embedded::EmbeddedAssetRegistry},
     color::palettes::css,
     prelude::*,
 };
 use bevy_egui::EguiPlugin;
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/lottie_player/src/ui.rs b/examples/lottie_player/src/ui.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy_egui::{
-    egui::{self, Color32},
     EguiContexts,
+    egui::{self, Color32},
 };
 use bevy_vello::{prelude::*, vello_svg::usvg::strict_num::Ulps};
 use std::time::Duration;
@@ -20,9 +20,7 @@ pub fn controls_ui(
     >,
     assets: Res<Assets<VelloLottie>>,
 ) {
-    let Some((ref mut player, ref mut playhead, ref mut options, ref mut theme, handle)) =
-        player.as_deref_mut()
-    else {
+    let Some((player, playhead, options, theme, handle)) = player.as_deref_mut() else {
         return;
     };
 
diff --git a/examples/lottie_ui/src/main.rs b/examples/lottie_ui/src/main.rs
@@ -1,9 +1,9 @@
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     color::palettes::css,
     prelude::*,
 };
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/render_layers/src/main.rs b/examples/render_layers/src/main.rs
@@ -1,7 +1,7 @@
 //! Shows how to use render layers.
 
 use bevy::{color::palettes::css, prelude::*, render::view::RenderLayers};
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 use std::ops::DerefMut;
 
 fn main() {
diff --git a/examples/scene/src/main.rs b/examples/scene/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 use std::ops::DerefMut;
 
 fn main() {
@@ -18,7 +18,7 @@ fn setup_vector_graphics(mut commands: Commands) {
 
 fn simple_animation(mut query_scene: Single<(&mut Transform, &mut VelloScene)>, time: Res<Time>) {
     let sin_time = time.elapsed_secs().sin().mul_add(0.5, 0.5);
-    let (ref mut transform, ref mut scene) = query_scene.deref_mut();
+    let (transform, scene) = query_scene.deref_mut();
     // Reset scene every frame
     scene.reset();
 
diff --git a/examples/scene_ui/src/main.rs b/examples/scene_ui/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::{color::palettes::css, prelude::*};
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 use std::{
     f64::consts::{FRAC_PI_4, SQRT_2},
     ops::DerefMut,
@@ -35,7 +35,7 @@ fn setup_ui(mut commands: Commands) {
 }
 
 fn update_ui(mut query: Single<(&ComputedNode, &Interaction, &mut VelloScene)>) {
-    let (node, interaction, ref mut scene) = query.deref_mut();
+    let (node, interaction, scene) = query.deref_mut();
 
     let size = node.size();
     let dmin = f32::min(size.x, size.y);
diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs
@@ -1,8 +1,8 @@
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     prelude::*,
 };
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/svg_ui/src/main.rs b/examples/svg_ui/src/main.rs
@@ -1,9 +1,9 @@
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     color::palettes::css,
     prelude::*,
 };
-use bevy_vello::{prelude::*, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*};
 
 fn main() {
     let mut app = App::new();
diff --git a/examples/text/src/main.rs b/examples/text/src/main.rs
@@ -1,10 +1,10 @@
 use std::f32::consts::PI;
 
 use bevy::{
-    asset::{embedded_asset, AssetMetaCheck},
+    asset::{AssetMetaCheck, embedded_asset},
     prelude::*,
 };
-use bevy_vello::{prelude::*, text::VelloTextAnchor, VelloPlugin};
+use bevy_vello::{VelloPlugin, prelude::*, text::VelloTextAnchor};
 
 fn main() {
     let mut app = App::new();
diff --git a/src/integrations/lottie/asset_loader.rs b/src/integrations/lottie/asset_loader.rs
@@ -1,7 +1,7 @@
 use super::asset::VelloLottie;
-use crate::integrations::{lottie::load_lottie_from_bytes, VectorLoaderError};
+use crate::integrations::{VectorLoaderError, lottie::load_lottie_from_bytes};
 use bevy::{
-    asset::{io::Reader, AssetLoader, LoadContext},
+    asset::{AssetLoader, LoadContext, io::Reader},
     prelude::*,
     utils::ConditionalSendFuture,
 };
diff --git a/src/integrations/lottie/player_state.rs b/src/integrations/lottie/player_state.rs
@@ -1,5 +1,5 @@
 use super::PlayerTransition;
-use crate::{integrations::lottie::asset::VelloLottieHandle, PlaybackOptions, Theme};
+use crate::{PlaybackOptions, Theme, integrations::lottie::asset::VelloLottieHandle};
 
 #[derive(Debug, Clone)]
 pub struct PlayerState {
diff --git a/src/integrations/lottie/plugin.rs b/src/integrations/lottie/plugin.rs
@@ -1,13 +1,12 @@
-use crate::render::{extract::VelloExtractStep, VelatoRenderer};
-
 use super::{
-    asset::VelloLottieHandle, asset_loader::VelloLottieLoader, render, systems, VelloLottie,
+    VelloLottie, asset::VelloLottieHandle, asset_loader::VelloLottieLoader, render, systems,
 };
+use crate::render::{VelatoRenderer, extract::VelloExtractStep};
 use bevy::{
     prelude::*,
     render::{
-        view::{check_visibility, VisibilitySystems},
         Render, RenderApp, RenderSet,
+        view::{VisibilitySystems, check_visibility},
     },
 };
 
diff --git a/src/integrations/lottie/render.rs b/src/integrations/lottie/render.rs
@@ -1,21 +1,21 @@
 use super::{
-    asset::{VelloLottie, VelloLottieHandle},
     Playhead, Theme, VelloLottieAnchor,
+    asset::{VelloLottie, VelloLottieHandle},
 };
 use crate::{
+    SkipEncoding,
     render::{
-        prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
         VelloEntityCountData, VelloView,
+        prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
     },
-    SkipEncoding,
 };
 use bevy::{
     prelude::*,
     render::{
+        Extract,
         camera::ExtractedCamera,
         sync_world::TemporaryRenderEntity,
         view::{ExtractedView, RenderLayers},
-        Extract,
     },
 };
 use vello::kurbo::Affine;
diff --git a/src/integrations/lottie/systems.rs b/src/integrations/lottie/systems.rs
@@ -1,14 +1,14 @@
 use crate::{
-    integrations::lottie::PlaybackPlayMode, render::VelloView, PlaybackDirection,
-    PlaybackLoopBehavior, PlaybackOptions, Playhead,
+    PlaybackDirection, PlaybackLoopBehavior, PlaybackOptions, Playhead,
+    integrations::lottie::PlaybackPlayMode, render::VelloView,
 };
 use bevy::{prelude::*, utils::Instant, window::PrimaryWindow};
 use std::time::Duration;
 use vello_svg::usvg::strict_num::Ulps;
 
 use super::{
-    asset::{VelloLottie, VelloLottieHandle},
     LottiePlayer, PlayerTransition,
+    asset::{VelloLottie, VelloLottieHandle},
 };
 
 /// Advance all playheads in the scene
@@ -56,7 +56,7 @@ pub fn advance_playheads(
         }
 
         // Handle intermissions
-        if let Some(ref mut intermission) = playhead.intermission {
+        if let Some(intermission) = playhead.intermission.as_mut() {
             intermission.tick(time.delta());
             if intermission.finished() {
                 playhead.intermission.take();
diff --git a/src/integrations/lottie/theme.rs b/src/integrations/lottie/theme.rs
@@ -5,8 +5,8 @@
 
 use bevy::{prelude::*, utils::HashMap};
 use velato::{
-    model::{Brush, Shape},
     Composition,
+    model::{Brush, Shape},
 };
 use vello::peniko::color::DynamicColor;
 
diff --git a/src/integrations/svg/asset_loader.rs b/src/integrations/svg/asset_loader.rs
@@ -1,7 +1,7 @@
 use super::asset::VelloSvg;
-use crate::integrations::{svg::load_svg_from_bytes, VectorLoaderError};
+use crate::integrations::{VectorLoaderError, svg::load_svg_from_bytes};
 use bevy::{
-    asset::{io::Reader, AssetLoader, LoadContext},
+    asset::{AssetLoader, LoadContext, io::Reader},
     prelude::*,
     utils::ConditionalSendFuture,
 };
diff --git a/src/integrations/svg/plugin.rs b/src/integrations/svg/plugin.rs
@@ -1,10 +1,10 @@
-use super::{asset::VelloSvgHandle, asset_loader::VelloSvgLoader, render, VelloSvg};
+use super::{VelloSvg, asset::VelloSvgHandle, asset_loader::VelloSvgLoader, render};
 use crate::render::extract::VelloExtractStep;
 use bevy::{
     prelude::*,
     render::{
-        view::{check_visibility, VisibilitySystems},
         Render, RenderApp, RenderSet,
+        view::{VisibilitySystems, check_visibility},
     },
 };
 
diff --git a/src/integrations/svg/render.rs b/src/integrations/svg/render.rs
@@ -1,21 +1,21 @@
 use super::{
-    asset::{VelloSvg, VelloSvgHandle},
     VelloSvgAnchor,
+    asset::{VelloSvg, VelloSvgHandle},
 };
 use crate::{
     prelude::*,
     render::{
-        prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
         VelloEntityCountData,
+        prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
     },
 };
 use bevy::{
     prelude::*,
     render::{
+        Extract,
         camera::ExtractedCamera,
         sync_world::TemporaryRenderEntity,
         view::{ExtractedView, RenderLayers},
-        Extract,
     },
 };
 use kurbo::Affine;
diff --git a/src/lib.rs b/src/lib.rs
@@ -23,9 +23,9 @@ pub mod prelude {
     pub use vello::{self, kurbo, peniko};
 
     pub use crate::{
+        VelloScene, VelloSceneBundle, VelloTextBundle,
         render::{SkipEncoding, VelloRenderSettings, VelloView},
         text::{VelloFont, VelloTextAnchor, VelloTextSection, VelloTextStyle},
-        VelloScene, VelloSceneBundle, VelloTextBundle,
     };
 
     #[cfg(feature = "lottie")]
diff --git a/src/plugin.rs b/src/plugin.rs
@@ -1,7 +1,7 @@
 use crate::{
+    VelloFont, VelloRenderSettings,
     render::{VelloCanvasSettings, VelloRenderPlugin},
     text::VelloFontLoader,
-    VelloFont, VelloRenderSettings,
 };
 use bevy::{prelude::*, render::view::RenderLayers};
 use vello::AaConfig;
diff --git a/src/render/extract.rs b/src/render/extract.rs
@@ -3,8 +3,8 @@ use crate::prelude::*;
 use bevy::{
     prelude::*,
     render::{
-        camera::ExtractedCamera, extract_component::ExtractComponent,
-        sync_world::TemporaryRenderEntity, view::RenderLayers, Extract, MainWorld,
+        Extract, MainWorld, camera::ExtractedCamera, extract_component::ExtractComponent,
+        sync_world::TemporaryRenderEntity, view::RenderLayers,
     },
 };
 
diff --git a/src/render/mod.rs b/src/render/mod.rs
diff --git a/src/render/plugin.rs b/src/render/plugin.rs
diff --git a/src/render/prepare.rs b/src/render/prepare.rs
diff --git a/src/render/systems.rs b/src/render/systems.rs
diff --git a/src/text/font.rs b/src/text/font.rs
diff --git a/src/text/font_loader.rs b/src/text/font_loader.rs

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ members = [`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`[workspace.package]`
`21`		`-edition = "2021"`
	`21`	`+edition = "2024"`
`22`	`22`	`version = "0.7.0"`
	`23`	`+rust-version = "1.85"`
`23`	`24`	`license = "MIT OR Apache-2.0"`
`24`	`25`	`repository = "https://github.com/linebender/bevy_vello"`
`25`	`26`