From 71f70f035ec026aa37444e41c2897fa6d025ff7e Mon Sep 17 00:00:00 2001 From: Jeroen Schweitzer Date: Sat, 25 Jul 2026 16:53:41 +0200 Subject: [PATCH] =?UTF-8?q?style(simulation):=20gate=20bounce=20=E2=80=94?= =?UTF-8?q?=20cargo=20fmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- server/src/atlas/believability.rs | 4 +++- server/src/atlas/cascade.rs | 20 ++++++++------------ server/src/atlas/district_profile.rs | 17 +++++++---------- server/src/atlas/layer_proxy.rs | 3 ++- server/src/bridge/mod.rs | 4 ++-- server/tests/bridge_tcp.rs | 3 +-- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/server/src/atlas/believability.rs b/server/src/atlas/believability.rs index fc9b17db2..f29e61bd2 100644 --- a/server/src/atlas/believability.rs +++ b/server/src/atlas/believability.rs @@ -686,7 +686,9 @@ fn read_feature_names(db: &PathBuf, body_id: &str) -> Result<(Vec, Vec r, Err(e) => { - eprintln!("[believability] skipped a malformed feature name row for {body_id}: {e}"); + eprintln!( + "[believability] skipped a malformed feature name row for {body_id}: {e}" + ); continue; } }; diff --git a/server/src/atlas/cascade.rs b/server/src/atlas/cascade.rs index de452d18a..bc54553bc 100644 --- a/server/src/atlas/cascade.rs +++ b/server/src/atlas/cascade.rs @@ -301,15 +301,13 @@ pub fn run_cascade_from_heightmap( name, feature_type: layer1::FeatureNameType::River, }) - .chain( - mountain_assignments - .into_iter() - .map(|(position, name)| layer1::FeatureNameAssignment { - position, - name, - feature_type: layer1::FeatureNameType::Mountain, - }), - ) + .chain(mountain_assignments.into_iter().map(|(position, name)| { + layer1::FeatureNameAssignment { + position, + name, + feature_type: layer1::FeatureNameType::Mountain, + } + })) .collect(); snapshot.layer1 = Some(l1); snapshot.terrain_analysis = Some(ta); @@ -607,9 +605,7 @@ mod tests { let river_attractor_count = l1 .attractors .iter() - .filter(|a| { - a.attractor_type == crate::simulation::generator::AttractorType::RiverMouth - }) + .filter(|a| a.attractor_type == crate::simulation::generator::AttractorType::RiverMouth) .count(); let expected_river_assignments = river_attractor_count.min(river_names.len()); let actual_river_assignments = l1 diff --git a/server/src/atlas/district_profile.rs b/server/src/atlas/district_profile.rs index e9d6c05b9..088db9380 100644 --- a/server/src/atlas/district_profile.rs +++ b/server/src/atlas/district_profile.rs @@ -2074,9 +2074,8 @@ pub fn derive_orbital_at_metres( let (wdx, wdy) = coast_invention::coast_warp_px(seed.seed(), world_x_m, world_y_m, &ch, 0.0); let (spx, spy) = (px + wdx, py + wdy); - let elev_q = - ((bilinear(&ta.elev_pct, ta.w, ta.h, spx, spy) as f64 * 100.0).round() as i32) - .clamp(0, 100); + let elev_q = ((bilinear(&ta.elev_pct, ta.w, ta.h, spx, spy) as f64 * 100.0).round() as i32) + .clamp(0, 100); let ocean_fraction_q = ((bilinear_bool(&ta.ocean_mask, ta.w, ta.h, spx, spy) as f64 * 100.0) .round() as i32) .clamp(0, 100); @@ -3707,8 +3706,7 @@ mod tests { latitude_deg: lat_deg, ..body_params.clone() }; - let driver_temp = - derive_temperature_c(&driver_params, &climate, seed.seed()); + let driver_temp = derive_temperature_c(&driver_params, &climate, seed.seed()); let driver_moisture = derive_moisture_q(&driver_params, raw_elev_q, raw_ocean_q, &climate); let driver_glaciation = @@ -3731,11 +3729,10 @@ mod tests { warp_only_nanos += warp_call_start.elapsed().as_nanos() as u64; warp_plus_character_nanos += warp_call_start.elapsed().as_nanos() as u64; let (spx, spy) = (px + wdx, py + wdy); - let warped_ocean_q = ((bilinear_bool(&ta.ocean_mask, ta.w, ta.h, spx, spy) - as f64 - * 100.0) - .round() as i32) - .clamp(0, 100); + let warped_ocean_q = + ((bilinear_bool(&ta.ocean_mask, ta.w, ta.h, spx, spy) as f64 * 100.0) + .round() as i32) + .clamp(0, 100); if (raw_ocean_q > 50) != (warped_ocean_q > 50) { disagreements += 1; diff --git a/server/src/atlas/layer_proxy.rs b/server/src/atlas/layer_proxy.rs index d609c05b8..a4d79f9eb 100644 --- a/server/src/atlas/layer_proxy.rs +++ b/server/src/atlas/layer_proxy.rs @@ -257,7 +257,8 @@ impl WindowGranularity { /// exists). A future coarser-than-region rung is added by widening this /// function's match AND [`WindowGranularity`]'s variant list together. fn resolve_window_granularity_v2(req: &AtlasLayerRequest) -> WindowGranularity { - req.window_granularity_v2.unwrap_or(WindowGranularity::District) + req.window_granularity_v2 + .unwrap_or(WindowGranularity::District) } /// Clamp `window_n` against BOTH the existing per-axis cap diff --git a/server/src/bridge/mod.rs b/server/src/bridge/mod.rs index 79b1bc43f..c5924c36a 100644 --- a/server/src/bridge/mod.rs +++ b/server/src/bridge/mod.rs @@ -7,8 +7,8 @@ use bevy_ecs::prelude::*; use bevy_ecs::schedule::IntoScheduleConfigs; use crate::atlas::atlas_data_proxy::{ - CityNamesRequest, CityNamesResponse, FeatureNamesRequest, FeatureNamesResponse, - StarMapRequest, StarMapResponse, + CityNamesRequest, CityNamesResponse, FeatureNamesRequest, FeatureNamesResponse, StarMapRequest, + StarMapResponse, }; use crate::atlas::browse_proxy::{BrowseRequest, BrowseResponse}; use crate::atlas::layer_proxy::{AtlasLayerRequest, AtlasLayerResponse}; diff --git a/server/tests/bridge_tcp.rs b/server/tests/bridge_tcp.rs index b5c9797bb..1e53ffea8 100644 --- a/server/tests/bridge_tcp.rs +++ b/server/tests/bridge_tcp.rs @@ -392,8 +392,7 @@ fn single_tick_drains_all_ready_inbound_frames() { feature_names: true, body_id: "GJ1c".into(), }; - let payload = - rmp_serde::to_vec_named(&fn_req).expect("failed to serialize feature names"); + let payload = rmp_serde::to_vec_named(&fn_req).expect("failed to serialize feature names"); write_framed(&mut stream, &payload).expect("write feature names frame"); stream });