fix: cargo fmt (#158)

Use new fmt rules

Author: simbleau

examples/drag_n_drop/src/main.rs

@@ -1,11 +1,12 @@
+use std::{ffi::OsStr, task::Poll};
+
 use bevy::{
     asset::{AssetMetaCheck, embedded_asset},
     color::palettes::css::RED,
     prelude::*,
 };
 use bevy_async_task::TaskRunner;
 use bevy_vello::{VelloPlugin, prelude::*};
-use std::{ffi::OsStr, task::Poll};
 
 const NORMAL_BUTTON: Color = Color::srgb(0.15, 0.15, 0.15);
 const HOVERED_BUTTON: Color = Color::srgb(0.25, 0.25, 0.25);

examples/lottie_player/src/ui.rs

@@ -1,10 +1,11 @@
+use std::time::Duration;
+
 use bevy::prelude::*;
 use bevy_egui::{
     EguiContexts,
     egui::{self, Color32},
 };
 use bevy_vello::prelude::*;
-use std::time::Duration;
 
 #[expect(clippy::type_complexity)]
 pub fn controls_ui(

examples/render_layers/src/main.rs

@@ -1,8 +1,9 @@
 //! Shows how to use render layers.
 
+use std::ops::DerefMut;
+
 use bevy::{color::palettes::css, prelude::*, render::view::RenderLayers};
 use bevy_vello::{VelloPlugin, prelude::*};
-use std::ops::DerefMut;
 
 fn main() {
     App::new()

examples/scene/src/main.rs

@@ -1,6 +1,7 @@
+use std::ops::DerefMut;
+
 use bevy::prelude::*;
 use bevy_vello::{VelloPlugin, prelude::*};
-use std::ops::DerefMut;
 
 fn main() {
     App::new()

examples/scene_ui/src/main.rs

@@ -1,10 +1,11 @@
-use bevy::{color::palettes::css, prelude::*};
-use bevy_vello::{VelloPlugin, prelude::*};
 use std::{
     f64::consts::{FRAC_PI_4, SQRT_2},
     ops::DerefMut,
 };
 
+use bevy::{color::palettes::css, prelude::*};
+use bevy_vello::{VelloPlugin, prelude::*};
+
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)

rustfmt.toml

@@ -1,6 +1,8 @@
 max_width = 100
-# TODO: comment_width = 100 - Wait for this to be stable
-# TODO: wrap_comments = true - Wait for this to be stable
 use_field_init_shorthand = true
 newline_style = "Unix"
-# TODO: imports_granularity = "Crate" - Wait for this to be stable.
+# TODO: Enable - Currently nightly only :(
+# group_imports = "StdExternalCrate"
+# wrap_comments = true
+# comment_width = 100
+# imports_granularity = "Crate"

src/diagnostics.rs

@@ -1,9 +1,10 @@
-use crate::render::{VelloEntityCountData, VelloFrameProfileData};
 use bevy::{
     diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic},
     prelude::*,
 };
 
+use crate::render::{VelloEntityCountData, VelloFrameProfileData};
+
 /// Adds Vello entity counting diagnostics to an App.
 #[derive(Default)]
 pub struct VelloEntityCountDiagnosticsPlugin;

src/integrations/lottie/asset.rs

@@ -1,10 +1,12 @@
-use crate::prelude::*;
+use std::sync::Arc;
+
 use bevy::{
     prelude::*,
     reflect::TypePath,
     render::view::{self, VisibilityClass},
 };
-use std::sync::Arc;
+
+use crate::prelude::*;
 
 #[derive(Component, Default, Debug, Clone, Deref, DerefMut, PartialEq, Eq, Reflect)]
 #[require(

src/integrations/lottie/asset_loader.rs

@@ -1,11 +1,12 @@
-use super::asset::VelloLottie;
-use crate::integrations::{VectorLoaderError, lottie::load_lottie_from_bytes};
 use bevy::{
     asset::{AssetLoader, LoadContext, io::Reader},
     prelude::*,
     tasks::ConditionalSendFuture,
 };
 
+use super::asset::VelloLottie;
+use crate::integrations::{VectorLoaderError, lottie::load_lottie_from_bytes};
+
 #[derive(Default)]
 pub struct VelloLottieLoader;
 

src/integrations/lottie/lottie_player.rs

@@ -1,6 +1,7 @@
-use super::PlayerState;
 use bevy::{platform::collections::HashMap, prelude::*};
 
+use super::PlayerState;
+
 /// A lottie player that allows runtime manipulation of Lottie animations.
 ///
 /// Controls lottie playback and transitions with state machine support.

src/integrations/lottie/mod.rs

@@ -34,9 +34,8 @@ mod player_transition;
 pub use player_transition::PlayerTransition;
 
 mod theme;
-pub use theme::Theme;
-
 use bevy::{prelude::*, render::view::VisibilityClass};
+pub use theme::Theme;
 
 #[cfg(feature = "lottie")]
 #[derive(Bundle, Default)]
@@ -59,7 +58,8 @@ pub struct VelloLottieBundle {
     pub visibility_class: VisibilityClass,
 }
 
-/// Describes how the asset is positioned relative to its [`Transform`]. It defaults to [`VelloAssetAnchor::Center`].
+/// Describes how the asset is positioned relative to its [`Transform`]. It defaults to
+/// [`VelloAssetAnchor::Center`].
 #[derive(Component, Default, Debug, Clone, Copy, PartialEq, Eq, Reflect)]
 #[reflect(Component)]
 pub enum VelloLottieAnchor {

src/integrations/lottie/parse.rs

@@ -1,7 +1,9 @@
+use std::sync::Arc;
+
+use bevy::prelude::*;
+
 use super::asset::VelloLottie;
 use crate::integrations::VectorLoaderError;
-use bevy::prelude::*;
-use std::sync::Arc;
 
 /// Deserialize a Lottie file from bytes.
 pub fn load_lottie_from_bytes(bytes: &[u8]) -> Result<VelloLottie, VectorLoaderError> {

src/integrations/lottie/playback_options.rs

@@ -1,8 +1,9 @@
 //! Playback options for lottie files.
 
-use bevy::prelude::*;
 use std::{ops::Range, time::Duration};
 
+use bevy::prelude::*;
+
 /// Playback options which adjust the playback of an asset.
 ///
 /// You can add this component directly to a `VelloAssetBundle` entity to adjust

src/integrations/lottie/plugin.rs

@@ -1,12 +1,13 @@
+use bevy::{
+    prelude::*,
+    render::{Render, RenderApp, RenderSet},
+};
+
 use super::{
     PlaybackOptions, VelloLottie, VelloLottieAnchor, asset::VelloLottieHandle,
     asset_loader::VelloLottieLoader, render, systems,
 };
 use crate::render::{VelatoRenderer, extract::VelloExtractStep};
-use bevy::{
-    prelude::*,
-    render::{Render, RenderApp, RenderSet},
-};
 
 pub struct LottieIntegrationPlugin;
 

src/integrations/lottie/render.rs

@@ -1,3 +1,14 @@
+use bevy::{
+    prelude::*,
+    render::{
+        Extract,
+        camera::ExtractedCamera,
+        sync_world::TemporaryRenderEntity,
+        view::{ExtractedView, RenderLayers},
+    },
+};
+use vello::kurbo::Affine;
+
 use super::{
     Playhead, Theme, VelloLottieAnchor,
     asset::{VelloLottie, VelloLottieHandle},
@@ -9,16 +20,6 @@ use crate::{
         prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
     },
 };
-use bevy::{
-    prelude::*,
-    render::{
-        Extract,
-        camera::ExtractedCamera,
-        sync_world::TemporaryRenderEntity,
-        view::{ExtractedView, RenderLayers},
-    },
-};
-use vello::kurbo::Affine;
 
 #[derive(Component, Clone)]
 pub struct ExtractedLottieAsset {

src/integrations/lottie/systems.rs

@@ -1,3 +1,7 @@
+use std::time::Duration;
+
+use bevy::{platform::time::Instant, prelude::*, window::PrimaryWindow};
+
 use super::{
     LottiePlayer, PlayerTransition,
     asset::{VelloLottie, VelloLottieHandle},
@@ -6,8 +10,6 @@ use crate::{
     PlaybackDirection, PlaybackLoopBehavior, PlaybackOptions, Playhead,
     integrations::lottie::PlaybackPlayMode, render::VelloView,
 };
-use bevy::{platform::time::Instant, prelude::*, window::PrimaryWindow};
-use std::time::Duration;
 
 /// Helper function to get the next smallest representable f64.
 /// For example, prev_f64(3.0) == 2.9999999999999996

src/integrations/svg/asset.rs

@@ -1,10 +1,12 @@
-use crate::prelude::*;
+use std::sync::Arc;
+
 use bevy::{
     prelude::*,
     reflect::TypePath,
     render::view::{self, VisibilityClass},
 };
-use std::sync::Arc;
+
+use crate::prelude::*;
 
 #[derive(Component, Default, Debug, Clone, Deref, DerefMut, PartialEq, Eq, Reflect)]
 #[require(VelloSvgAnchor, Transform, Visibility, VisibilityClass)]

src/integrations/svg/asset_loader.rs

@@ -1,11 +1,12 @@
-use super::asset::VelloSvg;
-use crate::integrations::{VectorLoaderError, svg::load_svg_from_bytes};
 use bevy::{
     asset::{AssetLoader, LoadContext, io::Reader},
     prelude::*,
     tasks::ConditionalSendFuture,
 };
 
+use super::asset::VelloSvg;
+use crate::integrations::{VectorLoaderError, svg::load_svg_from_bytes};
+
 #[derive(Default)]
 pub struct VelloSvgLoader;
 

src/integrations/svg/mod.rs

@@ -9,9 +9,8 @@ mod parse;
 pub use parse::{load_svg_from_bytes, load_svg_from_str};
 
 mod plugin;
-pub(crate) use plugin::SvgIntegrationPlugin;
-
 use bevy::{prelude::*, render::view::VisibilityClass};
+pub(crate) use plugin::SvgIntegrationPlugin;
 #[derive(Bundle, Default)]
 pub struct VelloSvgBundle {
     /// Asset data to render
@@ -26,7 +25,8 @@ pub struct VelloSvgBundle {
     pub visibility_class: VisibilityClass,
 }
 
-/// Describes how the asset is positioned relative to its [`Transform`]. It defaults to [`VelloAssetAnchor::Center`].
+/// Describes how the asset is positioned relative to its [`Transform`]. It defaults to
+/// [`VelloAssetAnchor::Center`].
 #[derive(Component, Default, Debug, Clone, Copy, PartialEq, Eq, Reflect)]
 #[reflect(Component)]
 pub enum VelloSvgAnchor {

src/integrations/svg/parse.rs

@@ -1,9 +1,11 @@
-use super::asset::VelloSvg;
-use crate::integrations::VectorLoaderError;
-use bevy::transform::components::Transform;
 use std::sync::Arc;
+
+use bevy::transform::components::Transform;
 use vello_svg::usvg::{self};
 
+use super::asset::VelloSvg;
+use crate::integrations::VectorLoaderError;
+
 /// Deserialize an SVG file from bytes.
 pub fn load_svg_from_bytes(bytes: &[u8]) -> Result<VelloSvg, VectorLoaderError> {
     let svg_str = std::str::from_utf8(bytes)?;

src/integrations/svg/plugin.rs

@@ -1,12 +1,13 @@
-use super::{
-    VelloSvg, VelloSvgAnchor, asset::VelloSvgHandle, asset_loader::VelloSvgLoader, render,
-};
-use crate::render::extract::VelloExtractStep;
 use bevy::{
     prelude::*,
     render::{Render, RenderApp, RenderSet},
 };
 
+use super::{
+    VelloSvg, VelloSvgAnchor, asset::VelloSvgHandle, asset_loader::VelloSvgLoader, render,
+};
+use crate::render::extract::VelloExtractStep;
+
 pub struct SvgIntegrationPlugin;
 
 impl Plugin for SvgIntegrationPlugin {

src/integrations/svg/render.rs

@@ -1,3 +1,14 @@
+use bevy::{
+    prelude::*,
+    render::{
+        Extract,
+        camera::ExtractedCamera,
+        sync_world::TemporaryRenderEntity,
+        view::{ExtractedView, RenderLayers},
+    },
+};
+use kurbo::Affine;
+
 use super::{
     VelloSvgAnchor,
     asset::{VelloSvg, VelloSvgHandle},
@@ -9,16 +20,6 @@ use crate::{
         prepare::{PrepareRenderInstance, PreparedAffine, PreparedTransform},
     },
 };
-use bevy::{
-    prelude::*,
-    render::{
-        Extract,
-        camera::ExtractedCamera,
-        sync_world::TemporaryRenderEntity,
-        view::{ExtractedView, RenderLayers},
-    },
-};
-use kurbo::Affine;
 
 #[derive(Component, Clone)]
 pub struct ExtractedVelloSvg {

src/integrations/text/font.rs

@@ -1,20 +1,22 @@
-use super::{
-    VelloTextAnchor,
-    context::LOCAL_FONT_CONTEXT,
-    vello_text::{VelloFontAxes, VelloTextSection},
-};
-use crate::integrations::text::context::{LOCAL_LAYOUT_CONTEXT, get_global_font_context};
+use std::borrow::Cow;
+
 use bevy::{prelude::*, reflect::TypePath, render::render_asset::RenderAsset};
 use parley::{
     FontSettings, FontStyle, FontVariation, PositionedLayoutItem, RangedBuilder, StyleProperty,
 };
-use std::borrow::Cow;
 use vello::{
     Scene,
     kurbo::Affine,
     peniko::{Brush, Fill},
 };
 
+use super::{
+    VelloTextAnchor,
+    context::LOCAL_FONT_CONTEXT,
+    vello_text::{VelloFontAxes, VelloTextSection},
+};
+use crate::integrations::text::context::{LOCAL_LAYOUT_CONTEXT, get_global_font_context};
+
 #[derive(Asset, TypePath, Debug, Clone)]
 pub struct VelloFont {
     /// Defaults to Bevy's bevy_text default font family name.

src/integrations/text/font_loader.rs

@@ -1,7 +1,8 @@
-use super::{context::get_global_font_context, font::VelloFont};
-use crate::{integrations::VectorLoaderError, integrations::text::context::LOCAL_FONT_CONTEXT};
 use bevy::asset::{AssetLoader, LoadContext, io::Reader};
 
+use super::{context::get_global_font_context, font::VelloFont};
+use crate::integrations::{VectorLoaderError, text::context::LOCAL_FONT_CONTEXT};
+
 #[derive(Default)]
 pub struct VelloFontLoader;