From 0c0f150140ad46357fe1e5f2e43a404e3f1e2b5f Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Thu, 3 Sep 2020 19:06:06 +0100 Subject: [PATCH] fmt --- common/src/time.rs | 8 ++------ server/src/events/entity_creation.rs | 4 ++-- voxygen/src/scene/figure/mod.rs | 10 ++++------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/common/src/time.rs b/common/src/time.rs index d47b98be05..8434b131b2 100644 --- a/common/src/time.rs +++ b/common/src/time.rs @@ -7,11 +7,7 @@ pub enum DayPeriod { } impl DayPeriod { - pub fn is_dark(&self) -> bool { - *self == DayPeriod::Night - } + pub fn is_dark(&self) -> bool { *self == DayPeriod::Night } - pub fn is_light(&self) -> bool { - !self.is_dark() - } + pub fn is_light(&self) -> bool { !self.is_dark() } } diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs index 9e0d39e8a3..6d64946d65 100644 --- a/server/src/events/entity_creation.rs +++ b/server/src/events/entity_creation.rs @@ -1,8 +1,8 @@ use crate::{sys, Server, StateExt}; use common::{ comp::{ - self, Agent, Alignment, Body, Gravity, Item, ItemDrop, LightEmitter, - Loadout, Pos, Projectile, Scale, Stats, Vel, WaypointArea, + self, Agent, Alignment, Body, Gravity, Item, ItemDrop, LightEmitter, Loadout, Pos, + Projectile, Scale, Stats, Vel, WaypointArea, }, outcome::Outcome, util::Dir, diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 0e4d5e2e6d..c871582ca4 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -364,15 +364,13 @@ impl FigureMgr { // TODO: Pending review in #587 pub fn update_lighting(&mut self, scene_data: &SceneData) { let ecs = scene_data.state.ecs(); - for ( - entity, - body, - light_emitter, - ) in ( + for (entity, body, light_emitter) in ( &ecs.entities(), ecs.read_storage::().maybe(), &ecs.read_storage::(), - ).join() { + ) + .join() + { // Add LightAnimation for objects with a LightEmitter let mut anim_storage = ecs.write_storage::(); if let None = anim_storage.get_mut(entity) {