From 9ff645066b035c66ef794c44ce631c1d262358fd Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Fri, 10 Dec 2021 20:16:48 -0500 Subject: [PATCH] Reorder use statements --- Makefile | 2 +- rustfmt.toml | 7 +++++++ src/damage_system.rs | 6 ++++-- src/gui.rs | 9 ++++++--- src/hunger_system.rs | 6 ++++-- src/inventory_system.rs | 7 +++++-- src/map.rs | 3 ++- src/map_builders.rs | 3 ++- src/map_builders/bsp_dungeon.rs | 9 +++++---- src/map_builders/bsp_interior.rs | 7 ++++--- src/map_builders/cellular_automata.rs | 11 +++++++---- src/map_builders/common.rs | 3 ++- src/map_builders/dla.rs | 11 +++++++---- src/map_builders/drunkard.rs | 11 +++++++---- src/map_builders/maze.rs | 13 ++++++++----- src/map_builders/prefab_builder.rs | 5 +++-- src/map_builders/simple_map.rs | 6 +++--- src/map_builders/voronoi.rs | 11 +++++++---- src/map_builders/waveform_collapse.rs | 14 ++++++++------ src/map_builders/waveform_collapse/constraints.rs | 3 ++- src/map_builders/waveform_collapse/solver.rs | 3 ++- src/map_indexing_system.rs | 3 ++- src/melee_combat_system.rs | 9 ++++++--- src/monster_ai_system.rs | 6 ++++-- src/particle_system.rs | 5 +++-- src/player.rs | 11 +++++++---- src/saveload_system.rs | 10 ++++++---- src/spawner.rs | 10 +++++++--- src/trigger_system.rs | 7 +++++-- src/visibility_system.rs | 7 ++++--- 30 files changed, 140 insertions(+), 78 deletions(-) create mode 100644 rustfmt.toml diff --git a/Makefile b/Makefile index 11b5f8f..6f3beb1 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ lint: cargo clippy fmt: - cargo fmt + cargo +nightly fmt fix: fmt cargo fix --allow-dirty --allow-staged diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..e5beae7 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,7 @@ +unstable_features = true +format_code_in_doc_comments = true +format_macro_matchers = true +format_strings = true +imports_granularity = "Module" +group_imports = "StdExternalCrate" +use_field_init_shorthand = true diff --git a/src/damage_system.rs b/src/damage_system.rs index d431b43..b8895a8 100644 --- a/src/damage_system.rs +++ b/src/damage_system.rs @@ -1,7 +1,9 @@ -use crate::components::{CombatStats, Name, Player, SufferDamage}; -use crate::{game_log::GameLog, Map, Position, RunState}; use specs::prelude::*; +use crate::components::{CombatStats, Name, Player, SufferDamage}; +use crate::game_log::GameLog; +use crate::{Map, Position, RunState}; + pub struct DamageSystem {} impl<'a> System<'a> for DamageSystem { diff --git a/src/gui.rs b/src/gui.rs index 135366d..510f5b4 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -1,9 +1,12 @@ +use rltk::{Point, Rltk, VirtualKeyCode, RGB}; +use specs::prelude::*; + use crate::components::{ CombatStats, HungerClock, HungerState, InBackpack, Name, Player, Position, Viewshed, }; -use crate::{game_log::GameLog, rex_assets::RexAssets, Equipped, Hidden, Map, RunState, State}; -use rltk::{Point, Rltk, VirtualKeyCode, RGB}; -use specs::prelude::*; +use crate::game_log::GameLog; +use crate::rex_assets::RexAssets; +use crate::{Equipped, Hidden, Map, RunState, State}; pub fn draw_ui(ecs: &World, ctx: &mut Rltk) { ctx.draw_box( diff --git a/src/hunger_system.rs b/src/hunger_system.rs index 78c22a3..0eebdb5 100644 --- a/src/hunger_system.rs +++ b/src/hunger_system.rs @@ -1,7 +1,9 @@ -use crate::components::{HungerClock, HungerState, SufferDamage}; -use crate::{game_log::GameLog, RunState}; use specs::prelude::*; +use crate::components::{HungerClock, HungerState, SufferDamage}; +use crate::game_log::GameLog; +use crate::RunState; + pub struct HungerSystem {} impl<'a> System<'a> for HungerSystem { diff --git a/src/inventory_system.rs b/src/inventory_system.rs index dc7dab9..9ef3e94 100644 --- a/src/inventory_system.rs +++ b/src/inventory_system.rs @@ -1,8 +1,11 @@ -use crate::components::*; -use crate::{game_log::GameLog, particle_system::ParticleBuilder, Map, RunState}; use rltk::RGB; use specs::prelude::*; +use crate::components::*; +use crate::game_log::GameLog; +use crate::particle_system::ParticleBuilder; +use crate::{Map, RunState}; + pub struct ItemCollectionSystem {} impl<'a> System<'a> for ItemCollectionSystem { diff --git a/src/map.rs b/src/map.rs index 964d37f..3491261 100644 --- a/src/map.rs +++ b/src/map.rs @@ -1,7 +1,8 @@ +use std::collections::HashSet; + use rltk::{Algorithm2D, BaseMap, Point, Rltk, SmallVec, RGB}; use serde::{Deserialize, Serialize}; use specs::prelude::*; -use std::collections::HashSet; pub const MAP_WIDTH: usize = 80; pub const MAP_HEIGHT: usize = 43; diff --git a/src/map_builders.rs b/src/map_builders.rs index ed65c63..f60ba60 100644 --- a/src/map_builders.rs +++ b/src/map_builders.rs @@ -10,7 +10,6 @@ mod simple_map; mod voronoi; mod waveform_collapse; -use crate::{spawner, Map, Position}; use bsp_dungeon::BspDungeonBuilder; use bsp_interior::BspInteriorBuilder; use cellular_automata::CellularAutomataBuilder; @@ -24,6 +23,8 @@ use specs::prelude::*; use voronoi::VoronoiCellBuilder; use waveform_collapse::WaveformCollapseBuilder; +use crate::{spawner, Map, Position}; + pub trait MapBuilder { fn get_map(&self) -> Map; fn get_starting_position(&self) -> Position; diff --git a/src/map_builders/bsp_dungeon.rs b/src/map_builders/bsp_dungeon.rs index 5e5449a..29ff6bb 100644 --- a/src/map_builders/bsp_dungeon.rs +++ b/src/map_builders/bsp_dungeon.rs @@ -1,10 +1,11 @@ -use super::MapBuilder; -use crate::map_builders::common::apply_room_to_map; -use crate::spawner; -use crate::{components::Position, Map, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; use rltk::RandomNumberGenerator; use specs::prelude::*; +use super::MapBuilder; +use crate::components::Position; +use crate::map_builders::common::apply_room_to_map; +use crate::{spawner, Map, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; + pub struct BspDungeonBuilder { map: Map, starting_position: Position, diff --git a/src/map_builders/bsp_interior.rs b/src/map_builders/bsp_interior.rs index adb2a56..452ad0a 100644 --- a/src/map_builders/bsp_interior.rs +++ b/src/map_builders/bsp_interior.rs @@ -1,9 +1,10 @@ -use super::MapBuilder; -use crate::spawner; -use crate::{components::Position, Map, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; use rltk::RandomNumberGenerator; use specs::prelude::*; +use super::MapBuilder; +use crate::components::Position; +use crate::{spawner, Map, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; + const MIN_ROOM_SIZE: i32 = 8; pub struct BspInteriorBuilder { diff --git a/src/map_builders/cellular_automata.rs b/src/map_builders/cellular_automata.rs index e057a02..370611f 100644 --- a/src/map_builders/cellular_automata.rs +++ b/src/map_builders/cellular_automata.rs @@ -1,11 +1,14 @@ +use std::collections::HashMap; + +use rltk::RandomNumberGenerator; +use specs::prelude::*; + use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, }; use super::MapBuilder; -use crate::{components::Position, spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; -use rltk::RandomNumberGenerator; -use specs::prelude::*; -use std::collections::HashMap; +use crate::components::Position; +use crate::{spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; pub struct CellularAutomataBuilder { map: Map, diff --git a/src/map_builders/common.rs b/src/map_builders/common.rs index 7c1ad89..b554c19 100644 --- a/src/map_builders/common.rs +++ b/src/map_builders/common.rs @@ -1,7 +1,8 @@ -use crate::{Map, Rect, TileType}; use std::cmp::{max, min}; use std::collections::HashMap; +use crate::{Map, Rect, TileType}; + #[derive(PartialEq, Copy, Clone)] #[allow(dead_code)] pub enum Symmetry { diff --git a/src/map_builders/dla.rs b/src/map_builders/dla.rs index 9d1871a..4f860b9 100644 --- a/src/map_builders/dla.rs +++ b/src/map_builders/dla.rs @@ -1,12 +1,15 @@ +use std::collections::HashMap; + +use rltk::RandomNumberGenerator; +use specs::prelude::*; + use super::common::{ generate_voronoi_spawn_regions, paint, remove_unreachable_areas_returning_most_distant, Symmetry, }; use super::MapBuilder; -use crate::{components::Position, spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; -use rltk::RandomNumberGenerator; -use specs::prelude::*; -use std::collections::HashMap; +use crate::components::Position; +use crate::{spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; #[derive(PartialEq, Copy, Clone)] pub enum DLAAlgorithm { diff --git a/src/map_builders/drunkard.rs b/src/map_builders/drunkard.rs index 1da5090..071ae17 100644 --- a/src/map_builders/drunkard.rs +++ b/src/map_builders/drunkard.rs @@ -1,12 +1,15 @@ +use std::collections::HashMap; + +use rltk::RandomNumberGenerator; +use specs::prelude::*; + use super::common::{ generate_voronoi_spawn_regions, paint, remove_unreachable_areas_returning_most_distant, Symmetry, }; use super::MapBuilder; -use crate::{components::Position, spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; -use rltk::RandomNumberGenerator; -use specs::prelude::*; -use std::collections::HashMap; +use crate::components::Position; +use crate::{spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; #[derive(PartialEq, Copy, Clone)] pub enum DrunkSpawnMode { diff --git a/src/map_builders/maze.rs b/src/map_builders/maze.rs index bc3d6f9..fd917ca 100644 --- a/src/map_builders/maze.rs +++ b/src/map_builders/maze.rs @@ -1,11 +1,14 @@ -use super::MapBuilder; -use super::{generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant}; -use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; -use rltk::RandomNumberGenerator; -use specs::prelude::*; use std::cmp::{max, min}; use std::collections::HashMap; +use rltk::RandomNumberGenerator; +use specs::prelude::*; + +use super::{ + generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, MapBuilder, +}; +use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; + pub struct MazeBuilder { map: Map, starting_position: Position, diff --git a/src/map_builders/prefab_builder.rs b/src/map_builders/prefab_builder.rs index 7b6cf98..7a5071d 100644 --- a/src/map_builders/prefab_builder.rs +++ b/src/map_builders/prefab_builder.rs @@ -1,11 +1,12 @@ mod prefab_levels; mod prefab_sections; -use super::{remove_unreachable_areas_returning_most_distant, MapBuilder}; -use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; use rltk::RandomNumberGenerator; use specs::prelude::*; +use super::{remove_unreachable_areas_returning_most_distant, MapBuilder}; +use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; + #[derive(PartialEq, Clone)] #[allow(dead_code)] pub enum PrefabMode { diff --git a/src/map_builders/simple_map.rs b/src/map_builders/simple_map.rs index 1b7a198..ff76d05 100644 --- a/src/map_builders/simple_map.rs +++ b/src/map_builders/simple_map.rs @@ -1,9 +1,9 @@ -use super::{apply_horizontal_tunnel, apply_room_to_map, apply_vertical_tunnel, MapBuilder}; -use crate::{spawner, SHOW_MAPGEN_VISUALIZER}; -use crate::{Map, Position, Rect, TileType}; use rltk::RandomNumberGenerator; use specs::prelude::*; +use super::{apply_horizontal_tunnel, apply_room_to_map, apply_vertical_tunnel, MapBuilder}; +use crate::{spawner, Map, Position, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; + pub struct SimpleMapBuilder { map: Map, starting_position: Position, diff --git a/src/map_builders/voronoi.rs b/src/map_builders/voronoi.rs index e3942ec..f1ec680 100644 --- a/src/map_builders/voronoi.rs +++ b/src/map_builders/voronoi.rs @@ -1,11 +1,14 @@ +use std::collections::HashMap; + +use rltk::RandomNumberGenerator; +use specs::prelude::*; + use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, }; use super::MapBuilder; -use crate::{components::Position, spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; -use rltk::RandomNumberGenerator; -use specs::prelude::*; -use std::collections::HashMap; +use crate::components::Position; +use crate::{spawner, Map, TileType, SHOW_MAPGEN_VISUALIZER}; #[derive(PartialEq, Copy, Clone)] #[allow(dead_code)] diff --git a/src/map_builders/waveform_collapse.rs b/src/map_builders/waveform_collapse.rs index 1274eef..6cb8d6a 100644 --- a/src/map_builders/waveform_collapse.rs +++ b/src/map_builders/waveform_collapse.rs @@ -2,17 +2,19 @@ mod common; mod constraints; mod solver; +use std::collections::HashMap; + +use common::*; +use constraints::*; +use rltk::RandomNumberGenerator; +use solver::*; +use specs::prelude::*; + use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, }; use super::MapBuilder; use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; -use common::*; -use constraints::*; -use rltk::RandomNumberGenerator; -use solver::*; -use specs::prelude::*; -use std::collections::HashMap; pub struct WaveformCollapseBuilder { map: Map, diff --git a/src/map_builders/waveform_collapse/constraints.rs b/src/map_builders/waveform_collapse/constraints.rs index c91ca94..48a9bcf 100644 --- a/src/map_builders/waveform_collapse/constraints.rs +++ b/src/map_builders/waveform_collapse/constraints.rs @@ -1,7 +1,8 @@ +use std::collections::HashSet; + use super::MapChunk; use crate::map_builders::waveform_collapse::common::tile_idx_in_chunk; use crate::{Map, TileType}; -use std::collections::HashSet; pub fn build_patterns( map: &Map, diff --git a/src/map_builders/waveform_collapse/solver.rs b/src/map_builders/waveform_collapse/solver.rs index 4380c5a..1b8422c 100644 --- a/src/map_builders/waveform_collapse/solver.rs +++ b/src/map_builders/waveform_collapse/solver.rs @@ -1,6 +1,7 @@ +use std::collections::HashSet; + use super::common::MapChunk; use crate::Map; -use std::collections::HashSet; pub struct Solver { constraints: Vec, diff --git a/src/map_indexing_system.rs b/src/map_indexing_system.rs index 17ad747..ea61458 100644 --- a/src/map_indexing_system.rs +++ b/src/map_indexing_system.rs @@ -1,6 +1,7 @@ -use crate::{BlocksTile, Map, Position}; use specs::prelude::*; +use crate::{BlocksTile, Map, Position}; + pub struct MapIndexingSystem {} impl<'a> System<'a> for MapIndexingSystem { diff --git a/src/melee_combat_system.rs b/src/melee_combat_system.rs index 1f02cd1..a81d383 100644 --- a/src/melee_combat_system.rs +++ b/src/melee_combat_system.rs @@ -1,10 +1,13 @@ +use rltk::RGB; +use specs::prelude::*; + use crate::components::{ CombatStats, DefenseBonus, Equipped, HungerClock, HungerState, MeleePowerBonus, Name, SufferDamage, WantsToMelee, }; -use crate::{game_log::GameLog, particle_system::ParticleBuilder, Position}; -use rltk::RGB; -use specs::prelude::*; +use crate::game_log::GameLog; +use crate::particle_system::ParticleBuilder; +use crate::Position; pub struct MeleeCombatSystem {} diff --git a/src/monster_ai_system.rs b/src/monster_ai_system.rs index 11ea224..337d105 100644 --- a/src/monster_ai_system.rs +++ b/src/monster_ai_system.rs @@ -1,8 +1,10 @@ -use crate::components::{Confusion, Monster, Position, Viewshed, WantsToMelee}; -use crate::{particle_system::ParticleBuilder, EntityMoved, Map, RunState}; use rltk::{Point, RGB}; use specs::prelude::*; +use crate::components::{Confusion, Monster, Position, Viewshed, WantsToMelee}; +use crate::particle_system::ParticleBuilder; +use crate::{EntityMoved, Map, RunState}; + pub struct MonsterAI {} impl<'a> System<'a> for MonsterAI { diff --git a/src/particle_system.rs b/src/particle_system.rs index 01e34e3..d14de7a 100644 --- a/src/particle_system.rs +++ b/src/particle_system.rs @@ -1,8 +1,9 @@ -use crate::components::{ParticleLifetime, Renderable}; -use crate::Position; use rltk::{Rltk, RGB}; use specs::prelude::*; +use crate::components::{ParticleLifetime, Renderable}; +use crate::Position; + pub fn cull_dead_particles(ecs: &mut World, ctx: &Rltk) { let mut dead_particles: Vec = Vec::new(); { diff --git a/src/player.rs b/src/player.rs index 5f18569..1e9255e 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,11 +1,14 @@ +use std::cmp::{max, min}; + +use rltk::{Point, Rltk, VirtualKeyCode}; +use specs::prelude::*; + use crate::components::{ CombatStats, EntityMoved, HungerClock, HungerState, Item, Monster, Player, Position, Viewshed, WantsToMelee, WantsToPickupItem, }; -use crate::{game_log::GameLog, Map, RunState, State, TileType}; -use rltk::{Point, Rltk, VirtualKeyCode}; -use specs::prelude::*; -use std::cmp::{max, min}; +use crate::game_log::GameLog; +use crate::{Map, RunState, State, TileType}; pub fn try_move_player(delta_x: i32, delta_y: i32, ecs: &mut World) { let mut positions = ecs.write_storage::(); diff --git a/src/saveload_system.rs b/src/saveload_system.rs index 95595ec..d4c6e2c 100644 --- a/src/saveload_system.rs +++ b/src/saveload_system.rs @@ -1,12 +1,14 @@ -use crate::components::*; +use std::fs; +use std::fs::File; +use std::path::Path; + use specs::error::NoError; use specs::prelude::*; use specs::saveload::{ DeserializeComponents, MarkedBuilder, SerializeComponents, SimpleMarker, SimpleMarkerAllocator, }; -use std::fs; -use std::fs::File; -use std::path::Path; + +use crate::components::*; macro_rules! serialize_individually { ($ecs:expr, $ser:expr, $data:expr, $( $type:ty),*,) => { diff --git a/src/spawner.rs b/src/spawner.rs index ff33813..fa40a0e 100644 --- a/src/spawner.rs +++ b/src/spawner.rs @@ -1,9 +1,13 @@ -use crate::components::*; -use crate::{map::MAP_WIDTH, random_table::RandomTable, Map, Rect, TileType}; +use std::collections::HashMap; + use rltk::{RandomNumberGenerator, RGB}; use specs::prelude::*; use specs::saveload::{MarkedBuilder, SimpleMarker}; -use std::collections::HashMap; + +use crate::components::*; +use crate::map::MAP_WIDTH; +use crate::random_table::RandomTable; +use crate::{Map, Rect, TileType}; /// Spawns the player and returns their entity object pub fn player(ecs: &mut World, player_x: i32, player_y: i32) -> Entity { diff --git a/src/trigger_system.rs b/src/trigger_system.rs index 46dccb0..67e4b67 100644 --- a/src/trigger_system.rs +++ b/src/trigger_system.rs @@ -1,9 +1,12 @@ +use specs::prelude::*; + use crate::components::{ EntityMoved, EntryTrigger, Hidden, InflictsDamage, Name, Position, SingleActivation, SufferDamage, }; -use crate::{game_log::GameLog, particle_system::ParticleBuilder, Map}; -use specs::prelude::*; +use crate::game_log::GameLog; +use crate::particle_system::ParticleBuilder; +use crate::Map; pub struct TriggerSystem {} diff --git a/src/visibility_system.rs b/src/visibility_system.rs index 40c48ca..d0e0947 100644 --- a/src/visibility_system.rs +++ b/src/visibility_system.rs @@ -1,9 +1,10 @@ -use crate::{ - components::Hidden, components::Name, game_log::GameLog, Map, Player, Position, Viewshed, -}; use rltk::{field_of_view, Point}; use specs::prelude::*; +use crate::components::{Hidden, Name}; +use crate::game_log::GameLog; +use crate::{Map, Player, Position, Viewshed}; + pub struct VisibilitySystem {} impl<'a> System<'a> for VisibilitySystem {