Style fix: imports on one line

iolivia · Nov 21, 2021 · 26b17f2 · 26b17f2
1 parent d9b570e
commit 26b17f2
Show file tree

Hide file tree

Showing 29 changed files with 100 additions and 101 deletions.
diff --git a/code/rust-sokoban-c02-04/src/systems/input_system.rs b/code/rust-sokoban-c02-04/src/systems/input_system.rs
@@ -2,8 +2,8 @@ use crate::components::*;
 use crate::constants::*;
 use crate::resources::InputQueue;
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c02-04/src/systems/rendering_system.rs b/code/rust-sokoban-c02-04/src/systems/rendering_system.rs
@@ -1,11 +1,11 @@
+
+
 use crate::components::*;
 use crate::constants::TILE_WIDTH;
-use ggez::graphics;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
-use glam::Vec2;
-use ggez::Context;
+
+use ggez::{Context, graphics::{self, DrawParam, Image}};
 use specs::{Join, ReadStorage, System};
+use glam::Vec2;
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,

diff --git a/code/rust-sokoban-c02-05/src/resources.rs b/code/rust-sokoban-c02-05/src/resources.rs
@@ -1,7 +1,7 @@
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c02-05/src/systems/input_system.rs b/code/rust-sokoban-c02-05/src/systems/input_system.rs
@@ -1,9 +1,9 @@
 use crate::components::*;
 use crate::constants::*;
 use crate::resources::{InputQueue, Gameplay};
-use ggez::event::KeyCode;
-use specs::world::Index;
+use specs::{world::Index, event::KeyCode};
 use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c02-05/src/systems/rendering_system.rs b/code/rust-sokoban-c02-05/src/systems/rendering_system.rs
@@ -1,13 +1,13 @@
+
+
+
 use crate::components::*;
 use crate::resources::*;
 use crate::constants::TILE_WIDTH;
-use ggez::graphics;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
-use ggez::graphics::Color;
-use glam::Vec2;
-use ggez::Context;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color}};
 use specs::{Join, ReadStorage, System, Read};
+use glam::Vec2;
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,

diff --git a/code/rust-sokoban-c03-01/src/components.rs b/code/rust-sokoban-c03-01/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c03-01/src/resources.rs b/code/rust-sokoban-c03-01/src/resources.rs
@@ -1,7 +1,7 @@
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c03-01/src/systems/input_system.rs b/code/rust-sokoban-c03-01/src/systems/input_system.rs
@@ -2,8 +2,8 @@ use crate::components::*;
 use crate::constants::*;
 use crate::resources::{InputQueue, Gameplay};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c03-01/src/systems/rendering_system.rs b/code/rust-sokoban-c03-01/src/systems/rendering_system.rs
@@ -1,13 +1,13 @@
+
+
+
 use crate::components::*;
 use crate::resources::*;
 use crate::constants::TILE_WIDTH;
-use ggez::graphics;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
-use ggez::graphics::Color;
-use glam::Vec2;
-use ggez::Context;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color}};
 use specs::{Join, ReadStorage, System, Read};
+use glam::Vec2;
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,

diff --git a/code/rust-sokoban-c03-02/src/components.rs b/code/rust-sokoban-c03-02/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c03-02/src/resources.rs b/code/rust-sokoban-c03-02/src/resources.rs
@@ -1,7 +1,7 @@
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::{fmt::Display, time::Duration};
+
+use std::{fmt::{self, Display}, time::Duration};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c03-02/src/systems/input_system.rs b/code/rust-sokoban-c03-02/src/systems/input_system.rs
@@ -2,8 +2,8 @@ use crate::components::*;
 use crate::constants::*;
 use crate::resources::{InputQueue, Gameplay};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c03-02/src/systems/rendering_system.rs b/code/rust-sokoban-c03-02/src/systems/rendering_system.rs
@@ -1,13 +1,13 @@
+
 use crate::components::*;
-use crate::constants::TILE_WIDTH;
 use crate::resources::*;
-use ggez::graphics;
-use ggez::graphics::Color;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
+use crate::constants::TILE_WIDTH;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color}};
+use specs::{Join, ReadStorage, System, Read};
 use glam::Vec2;
-use ggez::Context;
-use specs::{Join, Read, ReadStorage, System};
+
+
 use std::time::Duration;
 
 pub struct RenderingSystem<'a> {

diff --git a/code/rust-sokoban-c03-03/src/components.rs b/code/rust-sokoban-c03-03/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c03-03/src/resources.rs b/code/rust-sokoban-c03-03/src/resources.rs
@@ -2,8 +2,8 @@ use crate::audio::AudioStore;
 use crate::events::Event;
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::{fmt::Display, time::Duration};
+
+use std::{fmt::{self, Display}, time::Duration};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c03-03/src/systems/input_system.rs b/code/rust-sokoban-c03-03/src/systems/input_system.rs
@@ -3,8 +3,8 @@ use crate::constants::*;
 use crate::events::{EntityMoved, Event};
 use crate::resources::{EventQueue, Gameplay, InputQueue};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c03-03/src/systems/rendering_system.rs b/code/rust-sokoban-c03-03/src/systems/rendering_system.rs
@@ -1,15 +1,14 @@
+
+
 use crate::components::*;
 use crate::constants::TILE_WIDTH;
 use crate::resources::*;
-use ggez::graphics;
-use ggez::graphics::Color;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color}};
+use specs::{Join, ReadStorage, System, Read};
 use glam::Vec2;
-use ggez::Context;
-use specs::{Join, Read, ReadStorage, System};
-use std::time::Duration;
 
+use std::time::Duration;
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,
 }

diff --git a/code/rust-sokoban-c03-04/src/components.rs b/code/rust-sokoban-c03-04/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c03-04/src/resources.rs b/code/rust-sokoban-c03-04/src/resources.rs
@@ -2,8 +2,8 @@ use crate::audio::AudioStore;
 use crate::events::Event;
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::{fmt::Display, time::Duration};
+
+use std::{fmt::{self, Display}, time::Duration};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c03-04/src/systems/input_system.rs b/code/rust-sokoban-c03-04/src/systems/input_system.rs
@@ -3,8 +3,8 @@ use crate::constants::*;
 use crate::events::{EntityMoved, Event};
 use crate::resources::{EventQueue, Gameplay, InputQueue};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c03-04/src/systems/rendering_system.rs b/code/rust-sokoban-c03-04/src/systems/rendering_system.rs
@@ -1,16 +1,16 @@
+
+
+
 use crate::components::*;
-use crate::constants::TILE_WIDTH;
 use crate::resources::*;
-use ggez::graphics;
-use ggez::graphics::Color;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
+use crate::constants::TILE_WIDTH;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color, spritebatch::SpriteBatch}, timer};
+use specs::{Join, ReadStorage, System, Read};
 use glam::Vec2;
-use ggez::{timer, Context};
-use graphics::spritebatch::SpriteBatch;
 use itertools::Itertools;
-use specs::{Join, Read, ReadStorage, System};
-use std::{collections::HashMap, time::Duration};
+
+use std::{time::Duration, collections::HashMap};
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,

diff --git a/code/rust-sokoban-c03-05/src/components.rs b/code/rust-sokoban-c03-05/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c03-05/src/resources.rs b/code/rust-sokoban-c03-05/src/resources.rs
@@ -2,8 +2,8 @@ use crate::audio::AudioStore;
 use crate::events::Event;
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::{fmt::Display, time::Duration};
+
+use std::{fmt::{self, Display}, time::Duration};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c03-05/src/systems/input_system.rs b/code/rust-sokoban-c03-05/src/systems/input_system.rs
@@ -3,8 +3,8 @@ use crate::constants::*;
 use crate::events::{EntityMoved, Event};
 use crate::resources::{EventQueue, Gameplay, InputQueue};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c03-05/src/systems/rendering_system.rs b/code/rust-sokoban-c03-05/src/systems/rendering_system.rs
@@ -1,16 +1,16 @@
+
+
+
 use crate::components::*;
-use crate::constants::TILE_WIDTH;
 use crate::resources::*;
-use ggez::graphics;
-use ggez::graphics::Color;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
+use crate::constants::TILE_WIDTH;
+
+use ggez::{Context, graphics::{self, DrawParam, Image, Color, spritebatch::SpriteBatch}, timer};
+use specs::{Join, ReadStorage, System, Read};
 use glam::Vec2;
-use ggez::{timer, Context};
-use graphics::spritebatch::SpriteBatch;
 use itertools::Itertools;
-use specs::{Join, Read, ReadStorage, System};
-use std::{collections::HashMap, time::Duration};
+
+use std::{time::Duration, collections::HashMap};
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,

diff --git a/code/rust-sokoban-c04-01/src/components.rs b/code/rust-sokoban-c04-01/src/components.rs
@@ -1,6 +1,6 @@
 use specs::{Component, NullStorage, VecStorage, World, WorldExt};
-use std::fmt;
-use std::fmt::Display;
+
+use std::fmt::{self, Display};
 
 // Components
 #[derive(Debug, Component, Clone, Copy)]

diff --git a/code/rust-sokoban-c04-01/src/resources.rs b/code/rust-sokoban-c04-01/src/resources.rs
@@ -2,8 +2,8 @@ use crate::audio::AudioStore;
 use crate::events::Event;
 use ggez::event::KeyCode;
 use specs::World;
-use std::fmt;
-use std::{fmt::Display, time::Duration};
+
+use std::{fmt::{self, Display}, time::Duration};
 
 // Resources
 #[derive(Default)]

diff --git a/code/rust-sokoban-c04-01/src/systems/input_system.rs b/code/rust-sokoban-c04-01/src/systems/input_system.rs
@@ -3,8 +3,8 @@ use crate::constants::*;
 use crate::events::{EntityMoved, Event};
 use crate::resources::{EventQueue, Gameplay, InputQueue};
 use ggez::event::KeyCode;
-use specs::world::Index;
-use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
+use specs::{world::Index, Entities, Join, ReadStorage, System, Write, WriteStorage};
+
 use std::collections::HashMap;
 
 pub struct InputSystem {}

diff --git a/code/rust-sokoban-c04-01/src/systems/rendering_system.rs b/code/rust-sokoban-c04-01/src/systems/rendering_system.rs
@@ -1,17 +1,17 @@
+
+
+
+
 use crate::components::*;
-use crate::constants::TILE_WIDTH;
 use crate::resources::*;
-use ggez::graphics;
-use ggez::graphics::Color;
-use ggez::graphics::DrawParam;
-use ggez::graphics::Image;
-use glam::Vec2;
-use ggez::{timer, Context};
+use crate::constants::TILE_WIDTH;
 
-use graphics::spritebatch::SpriteBatch;
+use ggez::{Context, graphics::{self, DrawParam, Image, Color, spritebatch::SpriteBatch}, timer};
+use specs::{Join, ReadStorage, System, Read};
+use glam::Vec2;
 use itertools::Itertools;
-use specs::{Join, Read, ReadStorage, System};
-use std::{collections::HashMap, time::Duration};
+
+use std::{time::Duration, collections::HashMap};
 
 pub struct RenderingSystem<'a> {
     pub context: &'a mut Context,