Clean up imports

README.md

@@ -46,19 +46,19 @@ The best way to get started is to play around with what you find in [`src/demo/`
 
 This template comes with a basic project structure that you may find useful:
 
-| Path                                               | Description                                                                |
-| -------------------------------------------------- | -------------------------------------------------------------------------- |
-| [`src/lib.rs`](./src/lib.rs)                       | App setup                                                                  |
-| [`src/asset_tracking.rs`](./src/asset_tracking.rs) | A simple, high-level way to load collections of asset handles as resources |
-| [`src/audio/`](./src/audio)                        | Commands for playing SFX and music                                         |
-| [`src/demo/`](./src/demo)                          | Example game mechanics & content (replace with your own code)              |
-| [`src/dev_tools.rs`](./src/dev_tools.rs)           | Dev tools for dev builds (press \` aka backtick to toggle)                 |
-| [`src/screens/`](./src/screens)                    | Splash screen, title screen, playing screen, etc.                          |
-| [`src/theme/`](./src/theme)                        | Reusable UI widgets & theming
+| Path                                               | Description                                                        |
+| -------------------------------------------------- | ------------------------------------------------------------------ |
+| [`src/lib.rs`](./src/lib.rs)                       | App setup                                                          |
+| [`src/asset_tracking.rs`](./src/asset_tracking.rs) | A high-level way to load collections of asset handles as resources |
+| [`src/audio/`](./src/audio)                        | Commands for playing SFX and music                                 |
+| [`src/demo/`](./src/demo)                          | Example game mechanics & content (replace with your own code)      |
+| [`src/dev_tools.rs`](./src/dev_tools.rs)           | Dev tools for dev builds (press \` aka backtick to toggle)         |
+| [`src/screens/`](./src/screens)                    | Splash screen, title screen, playing screen, etc.                  |
+| [`src/theme/`](./src/theme)                        | Reusable UI widgets & theming                                      |
 
 Feel free to move things around however you want, though.
 
-If you are new to Bevy, the patterns used in this template may look a bit weird at first glance.
+If you're new to Bevy, the patterns used in this template may look a bit weird at first glance.
 See our [Design Document](./docs/design.md) for more information on how we structured the code and why.
 
 > [!Tip]

src/asset_tracking.rs

@@ -1,4 +1,4 @@
-//! A simple, high-level way to load collections of asset handles as resources
+//! A high-level way to load collections of asset handles as resources.
 
 use bevy::prelude::*;
 
@@ -38,7 +38,6 @@ type InsertLoadedResource = fn(&mut World, &UntypedHandle);
 #[derive(Resource, Default)]
 struct ResourceHandles {
     waiting: Vec<(UntypedHandle, InsertLoadedResource)>,
-    #[allow(unused)]
     finished: Vec<UntypedHandle>,
 }
 

src/demo/animation.rs

@@ -8,8 +8,9 @@ use bevy::prelude::*;
 use rand::prelude::*;
 use std::time::Duration;
 
-use super::movement::MovementController;
-use crate::{audio::SoundEffect, demo::player::PlayerAssets, AppSet};
+use crate::{
+    audio::SoundEffect, demo::movement::MovementController, demo::player::PlayerAssets, AppSet,
+};
 
 pub(super) fn plugin(app: &mut App) {
     // Animate and play sound effects based on controls.

src/demo/level.rs

@@ -2,7 +2,7 @@
 
 use bevy::{ecs::world::Command, prelude::*};
 
-use super::player::SpawnPlayer;
+use crate::demo::player::SpawnPlayer;
 
 pub(super) fn plugin(_app: &mut App) {
     // No setup required for this plugin.

src/screens/credits.rs

@@ -2,8 +2,7 @@
 
 use bevy::prelude::*;
 
-use super::Screen;
-use crate::{asset_tracking::LoadResource, audio::Music, theme::prelude::*};
+use crate::{asset_tracking::LoadResource, audio::Music, screens::Screen, theme::prelude::*};
 
 pub(super) fn plugin(app: &mut App) {
     app.load_resource::<CreditsMusic>();

src/screens/loading.rs

@@ -3,10 +3,9 @@
 
 use bevy::prelude::*;
 
-use super::Screen;
 use crate::{
     demo::player::PlayerAssets,
-    screens::{credits::CreditsMusic, playing::GameplayMusic},
+    screens::{credits::CreditsMusic, playing::GameplayMusic, Screen},
     theme::{interaction::InteractionAssets, prelude::*},
 };
 

src/screens/playing.rs

@@ -2,9 +2,9 @@
 
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
 
-use super::Screen;
 use crate::{
     asset_tracking::LoadResource, audio::Music, demo::level::spawn_level as spawn_level_command,
+    screens::Screen,
 };
 
 pub(super) fn plugin(app: &mut App) {

src/screens/splash.rs

@@ -6,8 +6,7 @@ use bevy::{
     render::texture::{ImageLoaderSettings, ImageSampler},
 };
 
-use super::Screen;
-use crate::{theme::prelude::*, AppSet};
+use crate::{screens::Screen, theme::prelude::*, AppSet};
 
 pub(super) fn plugin(app: &mut App) {
     // Spawn splash screen.

src/screens/title.rs

@@ -2,8 +2,7 @@
 
 use bevy::prelude::*;
 
-use super::Screen;
-use crate::theme::prelude::*;
+use crate::{screens::Screen, theme::prelude::*};
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(OnEnter(Screen::Title), show_title_screen);

src/theme/interaction.rs

@@ -1,9 +1,6 @@
+use bevy::prelude::*;
+
 use crate::{asset_tracking::LoadResource, audio::SoundEffect};
-use bevy::{
-    ecs::{system::SystemId, world::Command},
-    prelude::*,
-};
-use std::{collections::VecDeque, marker::PhantomData};
 
 pub(super) fn plugin(app: &mut App) {
     app.register_type::<InteractionPalette>();

src/theme/mod.rs

@@ -1,12 +1,13 @@
 //! Reusable UI widgets & theming.
 
-// Unused utilities and re-exports may trigger these lints undesirably.
-#![allow(dead_code, unused_imports)]
+// Unused utilities may trigger this lints undesirably.
+#![allow(dead_code)]
 
 pub mod interaction;
 pub mod palette;
 mod widgets;
 
+#[allow(unused_imports)]
 pub mod prelude {
     pub use super::{
         interaction::{InteractionPalette, OnPress},

src/theme/widgets.rs

@@ -1,15 +1,8 @@
 //! Helper traits for creating common widgets.
 
-use bevy::{
-    ecs::system::{EntityCommands, SystemId},
-    prelude::*,
-    ui::Val::*,
-};
+use bevy::{ecs::system::EntityCommands, prelude::*, ui::Val::*};
 
-use super::{
-    interaction::{InteractionPalette, OnPress},
-    palette::*,
-};
+use crate::theme::{interaction::InteractionPalette, palette::*};
 
 /// An extension trait for spawning UI widgets.
 pub trait Widgets {