From 331036be2059158aa0f3c61c12e009ff62a77454 Mon Sep 17 00:00:00 2001 From: Paris DOUADY Date: Tue, 3 Oct 2023 13:42:46 +0200 Subject: [PATCH] cargo fmt --- geom/src/boldspline.rs | 4 +- .../src/gui/inspect/inspect_building.rs | 48 ++++++++++++++----- native_app/src/gui/inspect/inspect_human.rs | 12 +++-- native_app/src/gui/inspect/inspect_train.rs | 4 +- native_app/src/gui/inspect/inspect_vehicle.rs | 4 +- native_app/src/gui/inspect/mod.rs | 4 +- native_app/src/gui/specialbuilding.rs | 2 +- native_app/src/gui/zoneedit.rs | 13 +++-- native_app/src/network.rs | 5 +- native_app/src/rendering/entity_render.rs | 4 +- native_app/src/rendering/immediate.rs | 4 +- .../src/rendering/map_rendering/lamps.rs | 8 +++- .../src/rendering/map_rendering/map_mesh.rs | 14 ++++-- native_app/src/rendering/map_rendering/mod.rs | 12 +++-- networking/src/connection_client.rs | 4 +- simulation/src/economy/government.rs | 8 +++- simulation/src/engine_interaction.rs | 12 +++-- simulation/src/map/map.rs | 12 +++-- simulation/src/map/objects/turn.rs | 8 +++- simulation/src/map_dynamic/dispatch.rs | 16 +++++-- simulation/src/map_dynamic/parking.rs | 4 +- simulation/src/souls/freight_station.rs | 6 ++- simulation/src/souls/human.rs | 8 +++- simulation/src/tests/mod.rs | 2 +- simulation/src/transportation/road.rs | 4 +- simulation/src/utils/config.rs | 4 +- simulation/src/utils/par_command_buffer.rs | 4 +- 27 files changed, 172 insertions(+), 58 deletions(-) diff --git a/geom/src/boldspline.rs b/geom/src/boldspline.rs index 0d7b31c2..db667100 100644 --- a/geom/src/boldspline.rs +++ b/geom/src/boldspline.rs @@ -62,7 +62,9 @@ impl Intersect for BoldSpline { let bbox = p.bbox().expand(self.radius); while let Some(v) = points.next() { - let Some(&peek) = points.peek() else { return false; }; + let Some(&peek) = points.peek() else { + return false; + }; let segment = Segment::new(v, peek); if !bbox.intersects(&segment) { diff --git a/native_app/src/gui/inspect/inspect_building.rs b/native_app/src/gui/inspect/inspect_building.rs index c39690cb..e4e2f943 100644 --- a/native_app/src/gui/inspect/inspect_building.rs +++ b/native_app/src/gui/inspect/inspect_building.rs @@ -15,7 +15,9 @@ use simulation::souls::goods_company::{GoodsCompanyRegistry, Recipe}; /// Inspect a specific building, showing useful information about it pub fn inspect_building(uiworld: &mut UiWorld, sim: &Simulation, ui: &Context, id: BuildingID) { let map = sim.map(); - let Some(building) = map.buildings().get(id) else { return; }; + let Some(building) = map.buildings().get(id) else { + return; + }; let gregistry = sim.read::(); let title: &str = match building.kind { @@ -72,8 +74,12 @@ pub fn inspect_building(uiworld: &mut UiWorld, sim: &Simulation, ui: &Context, i fn render_house(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b: &Building) { let binfos = sim.read::(); - let Some(info) = binfos.get(b.id) else { return; }; - let Some(SoulID::Human(owner)) = info.owner else { return; }; + let Some(info) = binfos.get(b.id) else { + return; + }; + let Some(SoulID::Human(owner)) = info.owner else { + return; + }; ui.horizontal(|ui| { ui.label("Owner"); @@ -82,14 +88,20 @@ fn render_house(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b: &Buildi ui.label("Currently in the house:"); for &soul in info.inside.iter() { - let SoulID::Human(soul) = soul else { continue; }; + let SoulID::Human(soul) = soul else { + continue; + }; entity_link(uiworld, sim, ui, soul); } } fn render_freightstation(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b: &Building) { - let Some(SoulID::FreightStation(owner)) = sim.read::().owner(b.id) else { return; }; - let Some(freight) = sim.world().get(owner) else { return; }; + let Some(SoulID::FreightStation(owner)) = sim.read::().owner(b.id) else { + return; + }; + let Some(freight) = sim.world().get(owner) else { + return; + }; ui.label(format!("Waiting cargo: {}", freight.f.waiting_cargo)); ui.label(format!("Wanted cargo: {}", freight.f.wanted_cargo)); @@ -117,8 +129,12 @@ fn render_freightstation(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b fn render_goodscompany(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b: &Building) { let owner = sim.read::().owner(b.id); - let Some(SoulID::GoodsCompany(c_id)) = owner else { return; }; - let Some(c) = sim.world().companies.get(c_id) else { return; }; + let Some(SoulID::GoodsCompany(c_id)) = owner else { + return; + }; + let Some(c) = sim.world().companies.get(c_id) else { + return; + }; let goods = &c.comp; let workers = &c.workers; @@ -156,11 +172,15 @@ fn render_goodscompany(ui: &mut Ui, uiworld: &mut UiWorld, sim: &Simulation, b: let jobopening = itemregistry.id("job-opening"); for (&id, m) in market.iter() { - let Some(v) = m.capital(c_id.into()) else { continue }; + let Some(v) = m.capital(c_id.into()) else { + continue; + }; if id == jobopening && v == 0 { continue; } - let Some(item) = itemregistry.get(id) else { continue }; + let Some(item) = itemregistry.get(id) else { + continue; + }; item_icon(ui, uiworld, item, v); } @@ -179,7 +199,9 @@ fn render_recipe(ui: &mut Ui, uiworld: &UiWorld, sim: &Simulation, recipe: &Reci }); ui.horizontal(|ui| { for &(good, amount) in recipe.consumption.iter() { - let Some(item) = registry.get(good) else { continue }; + let Some(item) = registry.get(good) else { + continue; + }; item_icon(ui, uiworld, item, amount); } }); @@ -195,7 +217,9 @@ fn render_recipe(ui: &mut Ui, uiworld: &UiWorld, sim: &Simulation, recipe: &Reci }); ui.horizontal(|ui| { for &(good, amount) in recipe.production.iter() { - let Some(item) = registry.get(good) else { continue }; + let Some(item) = registry.get(good) else { + continue; + }; item_icon(ui, uiworld, item, amount); } }); diff --git a/native_app/src/gui/inspect/inspect_human.rs b/native_app/src/gui/inspect/inspect_human.rs index cadc1092..1a049c24 100644 --- a/native_app/src/gui/inspect/inspect_human.rs +++ b/native_app/src/gui/inspect/inspect_human.rs @@ -12,7 +12,9 @@ use crate::uiworld::UiWorld; /// Inspect a specific building, showing useful information about it pub fn inspect_human(uiworld: &mut UiWorld, sim: &Simulation, ui: &Context, id: HumanID) -> bool { - let Some(human) = sim.get(id) else { return false; }; + let Some(human) = sim.get(id) else { + return false; + }; let mut is_open = true; egui::Window::new("Human") @@ -100,11 +102,15 @@ pub fn inspect_human(uiworld: &mut UiWorld, sim: &Simulation, ui: &Context, id: let jobopening = itemregistry.id("job-opening"); for (&item_id, m) in market.iter() { - let Some(v) = m.capital(id.into()) else { continue }; + let Some(v) = m.capital(id.into()) else { + continue; + }; if item_id == jobopening { continue; } - let Some(item) = itemregistry.get(item_id) else { continue }; + let Some(item) = itemregistry.get(item_id) else { + continue; + }; item_icon(ui, uiworld, item, v); } diff --git a/native_app/src/gui/inspect/inspect_train.rs b/native_app/src/gui/inspect/inspect_train.rs index ca931189..5f74314b 100644 --- a/native_app/src/gui/inspect/inspect_train.rs +++ b/native_app/src/gui/inspect/inspect_train.rs @@ -4,7 +4,9 @@ use egui::Context; use simulation::{Simulation, TrainID}; pub fn inspect_train(uiworld: &mut UiWorld, sim: &Simulation, ui: &Context, id: TrainID) -> bool { - let Some(t) = sim.get(id) else { return false; }; + let Some(t) = sim.get(id) else { + return false; + }; let mut is_open = true; egui::Window::new("Train") diff --git a/native_app/src/gui/inspect/inspect_vehicle.rs b/native_app/src/gui/inspect/inspect_vehicle.rs index 2f32869e..f7650f4a 100644 --- a/native_app/src/gui/inspect/inspect_vehicle.rs +++ b/native_app/src/gui/inspect/inspect_vehicle.rs @@ -10,7 +10,9 @@ pub fn inspect_vehicle( ui: &Context, id: VehicleID, ) -> bool { - let Some(v) = sim.get(id) else { return false; }; + let Some(v) = sim.get(id) else { + return false; + }; let name = format!("{:?}", v.vehicle.kind); diff --git a/native_app/src/gui/inspect/mod.rs b/native_app/src/gui/inspect/mod.rs index d46e357a..d4bad089 100644 --- a/native_app/src/gui/inspect/mod.rs +++ b/native_app/src/gui/inspect/mod.rs @@ -37,7 +37,9 @@ pub fn inspector(ui: &Context, uiworld: &mut UiWorld, sim: &Simulation) { is_open = inspect_vehicle(uiworld, sim, ui, id); } AnyEntity::WagonID(id) if !force_debug_inspect => { - let Some(w) = sim.world().get(id) else { return; }; + let Some(w) = sim.world().get(id) else { + return; + }; let train_id = w.itfollower.leader; uiworld.write::().e = Some(AnyEntity::TrainID(train_id)); } diff --git a/native_app/src/gui/specialbuilding.rs b/native_app/src/gui/specialbuilding.rs index 733c082f..793b4fea 100644 --- a/native_app/src/gui/specialbuilding.rs +++ b/native_app/src/gui/specialbuilding.rs @@ -114,7 +114,7 @@ pub fn specialbuilding(sim: &Simulation, uiworld: &mut UiWorld) { .min_by_key(move |p| OrderedFloat(p.points().project_dist2(mpos))); let Some(closest_road) = closest_road else { *uiworld.write::() = ErrorTooltip::new(Cow::Borrowed("No road nearby")); - return draw(hover_obb, true) + return draw(hover_obb, true); }; let (proj, _, dir) = closest_road.points().project_segment_dir(mpos); diff --git a/native_app/src/gui/zoneedit.rs b/native_app/src/gui/zoneedit.rs index e4587b8a..a1a183d4 100644 --- a/native_app/src/gui/zoneedit.rs +++ b/native_app/src/gui/zoneedit.rs @@ -24,12 +24,19 @@ pub fn zoneedit(sim: &Simulation, uiworld: &mut UiWorld) { let mut state = uiworld.write::(); let mut potentialcommand = uiworld.write::(); - let Some(bid) = inspected_b.e else { state.offset = None; return; }; + let Some(bid) = inspected_b.e else { + state.offset = None; + return; + }; let map = sim.map(); - let Some(b) = map.buildings().get(bid) else { return; }; + let Some(b) = map.buildings().get(bid) else { + return; + }; - let Some(ref zone) = b.zone else { return; }; + let Some(ref zone) = b.zone else { + return; + }; let filldir = zone.filldir; let zone = &zone.poly; diff --git a/native_app/src/network.rs b/native_app/src/network.rs index c8bffe01..ca501258 100644 --- a/native_app/src/network.rs +++ b/native_app/src/network.rs @@ -59,7 +59,10 @@ fn handle_singleplayer(state: &mut State) { let mut net_state = state.uiw.write::(); #[allow(irrefutable_let_patterns)] - let NetworkState::Singleplayer(ref mut step) = *net_state else { return; }; + let NetworkState::Singleplayer(ref mut step) = *net_state + else { + return; + }; let mut commands_once = Some(commands.clone()); step.prepare_frame(timewarp); diff --git a/native_app/src/rendering/entity_render.rs b/native_app/src/rendering/entity_render.rs index 4043995a..b942eff8 100644 --- a/native_app/src/rendering/entity_render.rs +++ b/native_app/src/rendering/entity_render.rs @@ -94,7 +94,9 @@ impl InstancedRender { self.path_not_found.clear(); for (_, (trans, itin)) in sim.world().query_trans_itin() { - let Some(wait) = itin.is_wait_for_reroute() else { continue }; + let Some(wait) = itin.is_wait_for_reroute() else { + continue; + }; if wait == 0 { continue; } diff --git a/native_app/src/rendering/immediate.rs b/native_app/src/rendering/immediate.rs index 4e18ae89..eca7c061 100644 --- a/native_app/src/rendering/immediate.rs +++ b/native_app/src/rendering/immediate.rs @@ -238,7 +238,9 @@ impl ImmediateDraw { ); } OrderKind::TexturedOBB { obb, ref path, z } => { - let Ok(tex) = ctx.gfx.try_texture(path, "some immediate obb") else { continue }; + let Ok(tex) = ctx.gfx.try_texture(path, "some immediate obb") else { + continue; + }; ctx.objs.push(Box::new( SpriteBatchBuilder::::new(tex, ctx.gfx) .push(obb.center().z(z), obb.axis()[0].z0(), *color, (1.0, 1.0)) diff --git a/native_app/src/rendering/map_rendering/lamps.rs b/native_app/src/rendering/map_rendering/lamps.rs index 04499efa..4a3446e3 100644 --- a/native_app/src/rendering/map_rendering/lamps.rs +++ b/native_app/src/rendering/map_rendering/lamps.rs @@ -29,8 +29,12 @@ impl LampsRender { for chunk in self.lamp_sub.take_updated_chunks() { let lamp_chunk_memory = self.lamp_road_memory.entry(chunk).or_default(); for (chunk_id, lamp) in lamp_chunk_memory.drain(..) { - let Some(lamps) = self.lamp_memory.get_mut(&chunk_id) else { continue }; - let Some(idx) = lamps.iter().position(|x| *x == lamp) else { continue }; + let Some(lamps) = self.lamp_memory.get_mut(&chunk_id) else { + continue; + }; + let Some(idx) = lamps.iter().position(|x| *x == lamp) else { + continue; + }; to_reupload.insert(chunk_id); lamps.swap_remove(idx); } diff --git a/native_app/src/rendering/map_rendering/map_mesh.rs b/native_app/src/rendering/map_rendering/map_mesh.rs index 9c812d63..b97a0a3b 100644 --- a/native_app/src/rendering/map_rendering/map_mesh.rs +++ b/native_app/src/rendering/map_rendering/map_mesh.rs @@ -390,8 +390,12 @@ impl MapBuilders { } fn zone_mesh(&mut self, building: &Building) { - let Some(bzone) = &building.zone else { return; }; - let Some((zone_mesh, filler, randomize)) = self.zonemeshes.get_mut(&building.kind) else { return; }; + let Some(bzone) = &building.zone else { + return; + }; + let Some((zone_mesh, filler, randomize)) = self.zonemeshes.get_mut(&building.kind) else { + return; + }; let zone = &bzone.poly; let randomize = *randomize; @@ -408,7 +412,11 @@ impl MapBuilders { let principal_axis = building.obb.axis()[0].normalize().rotated_by(bzone.filldir); - let Some((mut min, mut max)) = minmax(zone.iter().map(|x| x.rotated_by(principal_axis.flipy()))) else { return; }; + let Some((mut min, mut max)) = + minmax(zone.iter().map(|x| x.rotated_by(principal_axis.flipy()))) + else { + return; + }; min = min.rotated_by(principal_axis); max = max.rotated_by(principal_axis); diff --git a/native_app/src/rendering/map_rendering/mod.rs b/native_app/src/rendering/map_rendering/mod.rs index c51a119f..7eddf159 100644 --- a/native_app/src/rendering/map_rendering/mod.rs +++ b/native_app/src/rendering/map_rendering/mod.rs @@ -113,7 +113,9 @@ impl MapRenderer { continue; } } - let Some(lane) = map.lanes().get(lane_id) else { continue }; + let Some(lane) = map.lanes().get(lane_id) else { + continue; + }; Self::render_lane_signals(lane, draw, time); } } @@ -131,8 +133,12 @@ impl MapRenderer { .spatial_map() .query(Circle::new(pos.xy(), 200.0), ProjectFilter::ROAD) { - let ProjectKind::Road(id) = kind else { continue }; - let Some(r) = map.roads().get(id) else { continue }; + let ProjectKind::Road(id) = kind else { + continue; + }; + let Some(r) = map.roads().get(id) else { + continue; + }; if !frustrum.intersects(&r.points.bbox().expand(r.width)) { continue; } diff --git a/networking/src/connection_client.rs b/networking/src/connection_client.rs index b52b8e12..f4d1d250 100644 --- a/networking/src/connection_client.rs +++ b/networking/src/connection_client.rs @@ -68,7 +68,9 @@ impl ConnectionClient { pub fn recv_tcp(&mut self) -> Vec> { let mut packets = Vec::new(); - let Ok(v) = self.tcp_conn.1.try_recv() else { return packets }; + let Ok(v) = self.tcp_conn.1.try_recv() else { + return packets; + }; self.tcp_conn.0.recv(&v, |d| { packets.push(d); diff --git a/simulation/src/economy/government.rs b/simulation/src/economy/government.rs index e443857f..c0fa33ad 100644 --- a/simulation/src/economy/government.rs +++ b/simulation/src/economy/government.rs @@ -31,8 +31,12 @@ impl Government { zone: z, } => { let m = sim.map(); - let Some(b) = m.buildings.get(*bid) else { return Money::ZERO; }; - let Some(gc) = b.kind.as_goods_company() else { return Money::ZERO; }; + let Some(b) = m.buildings.get(*bid) else { + return Money::ZERO; + }; + let Some(gc) = b.kind.as_goods_company() else { + return Money::ZERO; + }; let registry = sim.read::(); let zonedescr = registry.descriptions[gc].zone.as_ref().unwrap(); diff --git a/simulation/src/engine_interaction.rs b/simulation/src/engine_interaction.rs index 57ad0126..b8c49cdf 100644 --- a/simulation/src/engine_interaction.rs +++ b/simulation/src/engine_interaction.rs @@ -21,7 +21,7 @@ use crate::transportation::train::{spawn_train, RailWagonKind}; use crate::transportation::{spawn_parked_vehicle_with_spot, unpark, VehicleKind}; use crate::utils::rand_provider::RandProvider; use crate::utils::time::{GameTime, Tick}; -use crate::{SimulationOptions, Replay, Simulation}; +use crate::{Replay, Simulation, SimulationOptions}; #[derive(Clone, Default)] pub struct WorldCommands { @@ -314,11 +314,17 @@ impl WorldCommand { let map = sim.map(); let mut rng = sim.write::(); - let Some(spot) = pm.reserve_random_free_spot(&map.parking, rng.next_u64()) else { continue; }; + let Some(spot) = pm.reserve_random_free_spot(&map.parking, rng.next_u64()) + else { + continue; + }; drop((map, pm, rng)); - let Some(v_id) = spawn_parked_vehicle_with_spot(sim, VehicleKind::Car, spot) else { continue; }; + let Some(v_id) = spawn_parked_vehicle_with_spot(sim, VehicleKind::Car, spot) + else { + continue; + }; unpark(sim, v_id); sim.write::().vehicles.insert(v_id); diff --git a/simulation/src/map/map.rs b/simulation/src/map/map.rs index be7f7eb5..37a21b0b 100644 --- a/simulation/src/map/map.rs +++ b/simulation/src/map/map.rs @@ -66,7 +66,9 @@ impl Map { pub fn update_intersection(&mut self, id: IntersectionID, f: impl Fn(&mut Intersection)) { info!("update_intersection {:?}", id); - let Some(inter) = self.intersections.get_mut(id) else { return; }; + let Some(inter) = self.intersections.get_mut(id) else { + return; + }; f(inter); self.invalidate(id); @@ -156,10 +158,14 @@ impl Map { } pub fn update_zone(&mut self, id: BuildingID, f: impl FnOnce(&mut Zone)) { - let Some(b) = self.buildings.get_mut(id) else { return; }; + let Some(b) = self.buildings.get_mut(id) else { + return; + }; self.subscribers.dispatch(UpdateType::Building, b); - let Some(ref mut z) = b.zone else { return; }; + let Some(ref mut z) = b.zone else { + return; + }; f(z); self.terrain.remove_near(&z.poly, |c| { diff --git a/simulation/src/map/objects/turn.rs b/simulation/src/map/objects/turn.rs index 2d5edcdb..8580fe78 100644 --- a/simulation/src/map/objects/turn.rs +++ b/simulation/src/map/objects/turn.rs @@ -87,8 +87,12 @@ impl Turn { } pub fn make_points(&mut self, lanes: &Lanes, parent: &Intersection) { - let Some(src_lane) = lanes.get(self.id.src) else { return; }; - let Some(dst_lane) = lanes.get(self.id.dst) else { return; }; + let Some(src_lane) = lanes.get(self.id.src) else { + return; + }; + let Some(dst_lane) = lanes.get(self.id.dst) else { + return; + }; let pos_src = src_lane.get_inter_node_pos(self.id.parent); let pos_dst = dst_lane.get_inter_node_pos(self.id.parent); diff --git a/simulation/src/map_dynamic/dispatch.rs b/simulation/src/map_dynamic/dispatch.rs index 3ae60b90..47711633 100644 --- a/simulation/src/map_dynamic/dispatch.rs +++ b/simulation/src/map_dynamic/dispatch.rs @@ -108,13 +108,17 @@ impl Dispatcher { pub fn free(&mut self, ent: impl Into) { let ent: DispatchID = ent.into(); let kind: DispatchKind = ent.into(); - let Some(disp) = self.dispatches.get_mut(&kind) else { return }; + let Some(disp) = self.dispatches.get_mut(&kind) else { + return; + }; disp.reserved_by.remove(&ent); } pub fn unregister(&mut self, id: DispatchID) { let kind = id.into(); - let Some(disp) = self.dispatches.get_mut(&kind) else { return }; + let Some(disp) = self.dispatches.get_mut(&kind) else { + return; + }; disp.unregister(id); } @@ -204,7 +208,9 @@ impl DispatchOne { } pub fn unregister(&mut self, id: DispatchID) { - let Some(pos) = self.positions.remove(&id) else { return }; + let Some(pos) = self.positions.remove(&id) else { + return; + }; self.reserved_by.remove(&id); self.lanes.get_mut(&pos.lane).unwrap().retain(|e| *e != id); } @@ -256,7 +262,9 @@ impl DispatchOne { TraverseDirection::Backward => tid.dst, }) }) { - let Some(ents) = self.lanes.get(&lane) else { continue }; + let Some(ents) = self.lanes.get(&lane) else { + continue; + }; for ent in ents { if self.reserved_by.contains(ent) { continue; diff --git a/simulation/src/map_dynamic/parking.rs b/simulation/src/map_dynamic/parking.rs index 6946237f..d3371eba 100644 --- a/simulation/src/map_dynamic/parking.rs +++ b/simulation/src/map_dynamic/parking.rs @@ -45,7 +45,9 @@ impl ParkingManagement { rng: u64, ) -> Option { for i_try in 0..3 { - let Some(spot) = spots.random_spot(rng.wrapping_add(i_try)) else { continue; }; + let Some(spot) = spots.random_spot(rng.wrapping_add(i_try)) else { + continue; + }; if self.reserved_spots.insert(spot) { return Some(SpotReservation(spot)); } diff --git a/simulation/src/souls/freight_station.rs b/simulation/src/souls/freight_station.rs index eed42753..672d27f4 100644 --- a/simulation/src/souls/freight_station.rs +++ b/simulation/src/souls/freight_station.rs @@ -85,7 +85,7 @@ pub fn freight_station_system(world: &mut World, resources: &mut Resources) { for (trainid, state) in &mut station.trains { let Some(train) = world.trains.get_mut(*trainid) else { to_clean.push(*trainid); - continue + continue; }; let itin = &mut train.it; @@ -206,7 +206,9 @@ mod tests { .kind = HumanDecisionKind::DeliverAtBuilding(station); let binfos = test.g.read::(); - let SoulID::FreightStation(stationsoul) = binfos.owner(station).unwrap() else { panic!() }; + let SoulID::FreightStation(stationsoul) = binfos.owner(station).unwrap() else { + panic!() + }; drop(binfos); for _ in 0..100 { diff --git a/simulation/src/souls/human.rs b/simulation/src/souls/human.rs index f4da7c83..8a178e1d 100644 --- a/simulation/src/souls/human.rs +++ b/simulation/src/souls/human.rs @@ -106,9 +106,13 @@ impl HumanDecisionKind { true } HumanDecisionKind::DeliverAtBuilding(bid) => { - let Some(b) = map.buildings().get(bid) else { return true }; + let Some(b) = map.buildings().get(bid) else { + return true; + }; if matches!(b.kind, BuildingKind::RailFreightStation) { - let Some(SoulID::FreightStation(fid)) = binfos.owner(bid) else { return true }; + let Some(SoulID::FreightStation(fid)) = binfos.owner(bid) else { + return true; + }; cbuf_freight.exec_ent(fid, move |e| { if let Some(f) = e.world.freight_stations.get_mut(fid) { f.f.waiting_cargo += 1; diff --git a/simulation/src/tests/mod.rs b/simulation/src/tests/mod.rs index 79232e9b..c721383e 100644 --- a/simulation/src/tests/mod.rs +++ b/simulation/src/tests/mod.rs @@ -6,7 +6,7 @@ use crate::map::{BuildingID, LanePatternBuilder, ProjectFilter}; use crate::map_dynamic::BuildingInfos; use crate::utils::scheduler::SeqSchedule; use crate::utils::time::Tick; -use crate::{SimulationOptions, Simulation}; +use crate::{Simulation, SimulationOptions}; use common::logger::MyLog; use common::saveload::Encoder; use geom::{Vec2, Vec3}; diff --git a/simulation/src/transportation/road.rs b/simulation/src/transportation/road.rs index 0528daaf..e9f44b5c 100644 --- a/simulation/src/transportation/road.rs +++ b/simulation/src/transportation/road.rs @@ -18,7 +18,9 @@ pub fn vehicle_decision_system(world: &mut World, resources: &mut Resources) { let rc = &*resources.read(); world.vehicles.iter_mut().for_each(|(ent, v)| { - let Some(ref coll) = v.collider else { return; }; + let Some(ref coll) = v.collider else { + return; + }; vehicle_decision( ra, diff --git a/simulation/src/utils/config.rs b/simulation/src/utils/config.rs index 8ce37846..d2e45da7 100644 --- a/simulation/src/utils/config.rs +++ b/simulation/src/utils/config.rs @@ -52,7 +52,9 @@ fn load_config_start() -> Config { } fn save_config(config: &Config) { - let Ok(x) = common::saveload::JSONPretty::encode(config) else { return; }; + let Ok(x) = common::saveload::JSONPretty::encode(config) else { + return; + }; let _ = std::fs::write("assets/config.json", x); } diff --git a/simulation/src/utils/par_command_buffer.rs b/simulation/src/utils/par_command_buffer.rs index 2da42ca0..8cc66b2b 100644 --- a/simulation/src/utils/par_command_buffer.rs +++ b/simulation/src/utils/par_command_buffer.rs @@ -60,7 +60,9 @@ impl ParCommandBuffer { deleted.sort_unstable(); for entity in deleted { - let Some(v) = E::storage_mut(&mut sim.world).remove(entity) else { continue }; + let Some(v) = E::storage_mut(&mut sim.world).remove(entity) else { + continue; + }; E::sim_drop(v, entity, &mut sim.resources); }