Fix order of import statements using rustfmt

Author: ASalvail

screeps-game-api/src/constants.rs

@@ -4,17 +4,15 @@
 //! <https://github.com/screeps/common/commits/master/lib/constants.js>.
 //!
 //! [the game constants]: https://github.com/screeps/common/blob/master/lib/constants.js
-use stdweb::{Number, Reference, Value};
-
 use crate::{
     objects::RoomObject,
     traits::{FromExpectedType, TryFrom, TryInto},
     ConversionError,
 };
-
 use log::error;
 use num_derive::FromPrimitive;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use stdweb::{Number, Reference, Value};
 
 #[repr(i32)]
 #[derive(Debug, PartialEq, Eq, Clone, Copy, FromPrimitive, Hash)]
@@ -128,17 +126,15 @@ unsafe impl FindConstant for FindObject {
 }
 
 pub mod find {
-    use serde::Deserialize;
-
+    use super::FindConstant;
     use crate::{
         objects::{
             ConstructionSite, Creep, Flag, Mineral, Nuke, OwnedStructure, Resource, RoomPosition,
             Source, Structure, StructureSpawn, Tombstone,
         },
         traits::TryFrom,
     };
-
-    use super::FindConstant;
+    use serde::Deserialize;
 
     #[derive(Copy, Clone, Debug, Deserialize, PartialEq, Eq, Hash)]
     #[serde(transparent)]

screeps-game-api/src/game.rs

@@ -102,6 +102,7 @@ pub mod cpu {
 /// [http://docs.screeps.com/api/#Game.gcl]: http://docs.screeps.com/api/#Game.gcl
 pub mod gcl {
     use crate::macros::*;
+
     /// See [http://docs.screeps.com/api/#Game.gcl]
     ///
     /// [http://docs.screeps.com/api/#Game.gcl]: http://docs.screeps.com/api/#Game.gcl
@@ -128,18 +129,16 @@ pub mod gcl {
 ///
 /// [http://docs.screeps.com/api/#Game.map]: http://docs.screeps.com/api/#Game.map
 pub mod map {
-    use crate::macros::*;
-    use serde::Deserialize;
-    use std::{collections, mem};
-
-    use crate::traits::{TryFrom, TryInto};
-    use scoped_tls::scoped_thread_local;
-    use stdweb::Value;
-
     use crate::{
         constants::{find::Exit, Direction, ReturnCode},
+        macros::*,
         objects::RoomTerrain,
+        traits::{TryFrom, TryInto},
     };
+    use scoped_tls::scoped_thread_local;
+    use serde::Deserialize;
+    use std::{collections, mem};
+    use stdweb::Value;
 
     /// See [http://docs.screeps.com/api/#Game.map.describeExits]
     ///
@@ -271,14 +270,14 @@ pub mod map {
 }
 
 pub mod market {
-    use crate::{macros::*, traits::TryInto};
-    use serde::Deserialize;
-    use std::collections::HashMap;
-
     use crate::{
         constants::{ResourceType, ReturnCode},
+        macros::*,
+        traits::TryInto,
         Room,
     };
+    use serde::Deserialize;
+    use std::collections::HashMap;
 
     #[repr(u32)]
     #[derive(Clone, Debug)]

screeps-game-api/src/js_collections/js_vec.rs

@@ -1,13 +1,11 @@
 //! [`JsVec`]
-use std::marker::PhantomData;
-
-use stdweb::{Array, InstanceOf, JsSerialize, Reference, ReferenceType, Value};
-
 use crate::{
     macros::*,
     traits::{FromExpectedType, IntoExpectedType, TryFrom, TryInto},
     ConversionError,
 };
+use std::marker::PhantomData;
+use stdweb::{Array, InstanceOf, JsSerialize, Reference, ReferenceType, Value};
 
 //
 //   - InstanceOf

screeps-game-api/src/lib.rs

@@ -39,7 +39,6 @@ pub use crate::{
     positions::{LocalRoomName, LocalRoomNameParseError, LocalRoomPosition},
     traits::{FromExpectedType, IntoExpectedType},
 };
-
 pub use stdweb::private::ConversionError;
 
 /// Useful for `use screeps::prelude::*;` to bring in screeps traits. Does not

screeps-game-api/src/memory.rs

@@ -49,14 +49,13 @@
 //! access the memory via creeps, spawns, rooms and flags. Accessing the memory
 //! from those objects will also result in a `MemoryReference` which instead
 //! points at the root of this object's memory.
-//!
-use std::fmt;
 
 use crate::{
     macros::*,
     traits::{TryFrom, TryInto},
     ConversionError,
 };
+use std::fmt;
 use stdweb::{JsSerialize, Reference, Value};
 
 #[derive(Clone, Debug)]

screeps-game-api/src/objects/impls/creep.rs

@@ -1,5 +1,4 @@
-use std::{marker::PhantomData, mem};
-
+use super::room::Step;
 use crate::{
     constants::{Direction, Part, ResourceType, ReturnCode},
     macros::*,
@@ -12,10 +11,9 @@ use crate::{
     traits::TryFrom,
 };
 use scoped_tls::scoped_thread_local;
+use std::{marker::PhantomData, mem};
 use stdweb::{Reference, Value};
 
-use super::room::Step;
-
 scoped_thread_local!(static COST_CALLBACK: Box<dyn Fn(String, Reference) -> Option<Reference>>);
 
 impl Creep {

screeps-game-api/src/objects/impls/mineral.rs

@@ -3,6 +3,7 @@ use crate::{
     macros::*,
     objects::Mineral,
 };
+
 simple_accessors! {
     Mineral;
     (density -> density -> u32),

screeps-game-api/src/objects/impls/nuke.rs

@@ -1,4 +1,5 @@
 use crate::{macros::*, objects::Nuke};
+
 simple_accessors! {
     Nuke;
     // id from HasID

screeps-game-api/src/objects/impls/resource.rs

@@ -1,4 +1,5 @@
 use crate::{constants::ResourceType, macros::*, objects::Resource};
+
 impl Resource {
     pub fn resource_type(&self) -> ResourceType {
         js_unwrap!(__resource_type_str_to_num(@{self.as_ref()}.resourceType))

screeps-game-api/src/objects/impls/room.rs

@@ -1,14 +1,3 @@
-use std::{fmt, marker::PhantomData, mem, ops::Range};
-
-use scoped_tls::scoped_thread_local;
-use serde::{
-    self,
-    de::{self, Deserializer, MapAccess, Visitor},
-    Deserialize, Serialize,
-};
-use serde_json;
-use stdweb::{Reference, Value};
-
 use crate::{
     constants::{
         find::Exit, Color, Direction, FindConstant, LookConstant, ReturnCode, StructureType,
@@ -26,6 +15,15 @@ use crate::{
     traits::{TryFrom, TryInto},
     ConversionError,
 };
+use scoped_tls::scoped_thread_local;
+use serde::{
+    self,
+    de::{self, Deserializer, MapAccess, Visitor},
+    Deserialize, Serialize,
+};
+use serde_json;
+use std::{fmt, marker::PhantomData, mem, ops::Range};
+use stdweb::{Reference, Value};
 
 simple_accessors! {
     Room;

screeps-game-api/src/objects/impls/room_position.rs

@@ -1,3 +1,4 @@
+use super::room::{FindOptions, Path};
 use crate::{
     constants::{Color, Direction, FindConstant, LookConstant, ReturnCode},
     game,
@@ -9,8 +10,6 @@ use crate::{
 };
 use std::cmp::{Eq, PartialEq};
 
-use super::room::{FindOptions, Path};
-
 impl RoomPosition {
     pub fn new(x: u32, y: u32, room_name: &str) -> Self {
         js_unwrap!(new RoomPosition(@{x}, @{y}, @{room_name}))

screeps-game-api/src/objects/impls/source.rs

@@ -1,4 +1,5 @@
 use crate::{macros::*, objects::Source};
+
 simple_accessors! {
     Source;
     (energy -> energy -> u32),

screeps-game-api/src/objects/impls/structure_controller.rs

@@ -1,6 +1,5 @@
-use stdweb::Value;
-
 use crate::{constants::ReturnCode, macros::*, objects::StructureController};
+use stdweb::Value;
 simple_accessors! {
     StructureController;
     (level -> level -> u32),

screeps-game-api/src/objects/impls/structure_keeper_lair.rs

@@ -1,4 +1,5 @@
 use crate::{macros::*, objects::StructureKeeperLair};
+
 simple_accessors! {
     StructureKeeperLair;
     (ticks_to_spawn -> ticksToSpawn -> u32),

screeps-game-api/src/objects/impls/structure_lab.rs

@@ -3,6 +3,7 @@ use crate::{
     macros::*,
     objects::{Creep, StructureLab},
 };
+
 simple_accessors! {
     StructureLab;
     (mineral_amount -> mineralAmount -> u32),

screeps-game-api/src/objects/impls/structure_link.rs

@@ -1,4 +1,5 @@
 use crate::{constants::ReturnCode, macros::*, objects::StructureLink};
+
 impl StructureLink {
     pub fn transfer_energy(&self, target: &StructureLink, amount: Option<u32>) -> ReturnCode {
         match amount {

screeps-game-api/src/objects/impls/structure_nuker.rs

@@ -3,6 +3,7 @@ use crate::{
     macros::*,
     objects::{RoomPosition, StructureNuker},
 };
+
 simple_accessors! {
     StructureNuker;
     (ghodium -> ghodium -> u32),

screeps-game-api/src/objects/impls/structure_observer.rs

@@ -1,4 +1,5 @@
 use crate::{constants::ReturnCode, macros::*, objects::StructureObserver};
+
 impl StructureObserver {
     pub fn observe_room(&self, room_name: &str) -> ReturnCode {
         js_unwrap! {@{self.as_ref()}.observeRoom(@{room_name})}

screeps-game-api/src/objects/impls/structure_portal.rs

@@ -3,7 +3,6 @@ use crate::{
     objects::{RoomPosition, StructurePortal},
     traits::TryInto,
 };
-
 use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]

screeps-game-api/src/objects/impls/structure_power_bank.rs

@@ -1,4 +1,5 @@
 use crate::{macros::*, objects::StructurePowerBank};
+
 simple_accessors! {
     StructurePowerBank;
     (power -> power -> u32),

screeps-game-api/src/objects/impls/structure_power_spawn.rs

@@ -1,4 +1,5 @@
 use crate::{constants::ReturnCode, macros::*, objects::StructurePowerSpawn};
+
 simple_accessors! {
     StructurePowerSpawn;
     (power -> power -> u32),

screeps-game-api/src/objects/impls/structure_rampart.rs

@@ -1,4 +1,5 @@
 use crate::{constants::ReturnCode, macros::*, objects::StructureRampart};
+
 simple_accessors! {
     StructureRampart;
     (is_public -> isPublic -> bool),

screeps-game-api/src/objects/impls/structure_spawn.rs

@@ -1,12 +1,12 @@
-use stdweb::Reference;
-
 use crate::{
     constants::{Direction, Part, ReturnCode},
     macros::*,
     memory::MemoryReference,
     objects::{Creep, HasEnergyForSpawn, SizedRoomObject, Spawning, StructureSpawn},
     traits::TryInto,
 };
+use stdweb::Reference;
+
 simple_accessors! {
     StructureSpawn;
     (name -> name -> String),

screeps-game-api/src/objects/impls/structure_terminal.rs

@@ -3,6 +3,7 @@ use crate::{
     macros::*,
     objects::StructureTerminal,
 };
+
 impl StructureTerminal {
     pub fn send(
         &self,

screeps-game-api/src/objects/impls/structure_tower.rs

@@ -3,6 +3,7 @@ use crate::{
     macros::*,
     objects::{Creep, Structure, StructureTower},
 };
+
 impl StructureTower {
     pub fn attack(&self, target: &Creep) -> ReturnCode {
         js_unwrap! { @{self.as_ref()}.attack( @{target.as_ref()} ) }

screeps-game-api/src/objects/impls/tombstone.rs

@@ -2,6 +2,7 @@ use crate::{
     macros::*,
     objects::{Creep, Tombstone},
 };
+
 simple_accessors! {
     Tombstone;
     (creep -> creep -> Creep),

screeps-game-api/src/objects/structure.rs

@@ -1,12 +1,11 @@
-use stdweb::{InstanceOf, Reference, ReferenceType, Value};
-
 use super::*;
 use crate::{
     constants::StructureType,
     objects::{Attackable, CanDecay, CanStoreEnergy, HasCooldown, HasEnergyForSpawn, HasStore},
     traits::FromExpectedType,
     ConversionError,
 };
+use stdweb::{InstanceOf, Reference, ReferenceType, Value};
 
 /// Wrapper which can be any of the game Structures.
 ///

screeps-game-api/src/pathfinder.rs

@@ -1,14 +1,12 @@
-use std::{f64, marker::PhantomData, mem};
-
-use stdweb::{web::TypedArray, Array, Object, Reference, UnsafeTypedArray};
-
 use crate::{
     macros::*,
     objects::{HasPosition, RoomPosition},
     positions::LocalRoomPosition,
     traits::TryInto,
 };
 use scoped_tls::scoped_thread_local;
+use std::{f64, marker::PhantomData, mem};
+use stdweb::{web::TypedArray, Array, Object, Reference, UnsafeTypedArray};
 
 #[derive(Clone, Debug)]
 pub struct LocalCostMatrix {