Skip to content

Commit 16b6aa5

Browse files
committed
style: fix workspace-wide formatting issues
Apply cargo fmt to the entire workspace to resolve formatting inconsistencies that prevent QG-SANITY-GATE from passing. Changes are primarily import ordering and line-length adjustments across test and source files in 209 files. This is a foundational fix needed before Codecov and other PRs can merge successfully. https://claude.ai/code/session_01U8AKLUWvrAE2w6Ey63qDGQ
1 parent 607f501 commit 16b6aa5

209 files changed

Lines changed: 6206 additions & 3291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

crates/flight-ac7-input/tests/depth_tests.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
//! generation, managed-block patching, install workflow, and edge cases.
66
77
use flight_ac7_input::{
8-
Ac7InputError, Ac7InputProfile, ActionBinding, AxisBinding, RcMode,
9-
MANAGED_BLOCK_BEGIN, MANAGED_BLOCK_END,
10-
apply_profile_to_existing, install_profile, render_managed_block,
8+
Ac7InputError, Ac7InputProfile, ActionBinding, AxisBinding, MANAGED_BLOCK_BEGIN,
9+
MANAGED_BLOCK_END, RcMode, apply_profile_to_existing, install_profile, render_managed_block,
1110
steam_input_hint,
1211
};
1312
use std::fs;
@@ -696,7 +695,11 @@ fn error_display_io_error() {
696695
fn default_profile_has_four_axis_bindings() {
697696
let p = Ac7InputProfile::default();
698697
assert_eq!(p.axis_bindings.len(), 4);
699-
let names: Vec<&str> = p.axis_bindings.iter().map(|a| a.axis_name.as_str()).collect();
698+
let names: Vec<&str> = p
699+
.axis_bindings
700+
.iter()
701+
.map(|a| a.axis_name.as_str())
702+
.collect();
700703
assert!(names.contains(&"Pitch"));
701704
assert!(names.contains(&"Roll"));
702705
assert!(names.contains(&"Yaw"));

crates/flight-ac7-protocol/tests/depth_tests.rs

Lines changed: 80 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! serialization, and edge-case handling.
66
77
use flight_ac7_protocol::{
8-
Ac7Controls, Ac7ProtocolError, Ac7State, Ac7TelemetryPacket, AC7_TELEMETRY_SCHEMA_V1,
8+
AC7_TELEMETRY_SCHEMA_V1, Ac7Controls, Ac7ProtocolError, Ac7State, Ac7TelemetryPacket,
99
};
1010

1111
// ---------------------------------------------------------------------------
@@ -88,7 +88,8 @@ fn ignores_unknown_fields() {
8888

8989
#[test]
9090
fn from_json_slice_and_str_equivalent() {
91-
let json = r#"{"schema":"flight.ac7.telemetry/1","aircraft":"F-22A","state":{"altitude_m":5000.0}}"#;
91+
let json =
92+
r#"{"schema":"flight.ac7.telemetry/1","aircraft":"F-22A","state":{"altitude_m":5000.0}}"#;
9293
let from_str = Ac7TelemetryPacket::from_json_str(json).unwrap();
9394
let from_slice = Ac7TelemetryPacket::from_json_slice(json.as_bytes()).unwrap();
9495
assert_eq!(from_str, from_slice);
@@ -131,24 +132,26 @@ fn rejects_bare_array() {
131132

132133
#[test]
133134
fn rejects_truncated_json() {
134-
let err = Ac7TelemetryPacket::from_json_str(r#"{"schema":"flight.ac7.telemetry/1""#)
135-
.unwrap_err();
135+
let err =
136+
Ac7TelemetryPacket::from_json_str(r#"{"schema":"flight.ac7.telemetry/1""#).unwrap_err();
136137
assert!(matches!(err, Ac7ProtocolError::InvalidJson(_)));
137138
}
138139

139140
#[test]
140141
fn rejects_wrong_type_for_timestamp() {
141-
let err =
142-
Ac7TelemetryPacket::from_json_str(r#"{"schema":"flight.ac7.telemetry/1","timestamp_ms":"not_a_number"}"#)
143-
.unwrap_err();
142+
let err = Ac7TelemetryPacket::from_json_str(
143+
r#"{"schema":"flight.ac7.telemetry/1","timestamp_ms":"not_a_number"}"#,
144+
)
145+
.unwrap_err();
144146
assert!(matches!(err, Ac7ProtocolError::InvalidJson(_)));
145147
}
146148

147149
#[test]
148150
fn rejects_negative_timestamp() {
149-
let err =
150-
Ac7TelemetryPacket::from_json_str(r#"{"schema":"flight.ac7.telemetry/1","timestamp_ms":-1}"#)
151-
.unwrap_err();
151+
let err = Ac7TelemetryPacket::from_json_str(
152+
r#"{"schema":"flight.ac7.telemetry/1","timestamp_ms":-1}"#,
153+
)
154+
.unwrap_err();
152155
assert!(matches!(err, Ac7ProtocolError::InvalidJson(_)));
153156
}
154157

@@ -219,7 +222,13 @@ fn rejects_altitude_just_beyond_bounds() {
219222
};
220223
let err = pkt.validate().unwrap_err();
221224
assert!(
222-
matches!(err, Ac7ProtocolError::OutOfRange { field: "state.altitude_m", .. }),
225+
matches!(
226+
err,
227+
Ac7ProtocolError::OutOfRange {
228+
field: "state.altitude_m",
229+
..
230+
}
231+
),
223232
"altitude {alt} should be rejected"
224233
);
225234
}
@@ -250,7 +259,10 @@ fn rejects_speed_beyond_bounds() {
250259
};
251260
assert!(matches!(
252261
pkt.validate().unwrap_err(),
253-
Ac7ProtocolError::OutOfRange { field: "state.speed_mps", .. }
262+
Ac7ProtocolError::OutOfRange {
263+
field: "state.speed_mps",
264+
..
265+
}
254266
));
255267
}
256268

@@ -265,7 +277,10 @@ fn rejects_negative_ground_speed() {
265277
};
266278
assert!(matches!(
267279
pkt.validate().unwrap_err(),
268-
Ac7ProtocolError::OutOfRange { field: "state.ground_speed_mps", .. }
280+
Ac7ProtocolError::OutOfRange {
281+
field: "state.ground_speed_mps",
282+
..
283+
}
269284
));
270285
}
271286

@@ -279,7 +294,10 @@ fn accepts_boundary_vertical_speed() {
279294
},
280295
..Default::default()
281296
};
282-
assert!(pkt.validate().is_ok(), "vertical speed {vs} should be valid");
297+
assert!(
298+
pkt.validate().is_ok(),
299+
"vertical speed {vs} should be valid"
300+
);
283301
}
284302
}
285303

@@ -294,7 +312,10 @@ fn rejects_vertical_speed_beyond_bounds() {
294312
};
295313
assert!(matches!(
296314
pkt.validate().unwrap_err(),
297-
Ac7ProtocolError::OutOfRange { field: "state.vertical_speed_mps", .. }
315+
Ac7ProtocolError::OutOfRange {
316+
field: "state.vertical_speed_mps",
317+
..
318+
}
298319
));
299320
}
300321

@@ -323,7 +344,10 @@ fn rejects_heading_beyond_bounds() {
323344
};
324345
assert!(matches!(
325346
pkt.validate().unwrap_err(),
326-
Ac7ProtocolError::OutOfRange { field: "state.heading_deg", .. }
347+
Ac7ProtocolError::OutOfRange {
348+
field: "state.heading_deg",
349+
..
350+
}
327351
));
328352
}
329353

@@ -353,7 +377,10 @@ fn rejects_pitch_beyond_bounds() {
353377
};
354378
assert!(matches!(
355379
pkt.validate().unwrap_err(),
356-
Ac7ProtocolError::OutOfRange { field: "state.pitch_deg", .. }
380+
Ac7ProtocolError::OutOfRange {
381+
field: "state.pitch_deg",
382+
..
383+
}
357384
));
358385
}
359386

@@ -368,7 +395,10 @@ fn rejects_roll_beyond_bounds() {
368395
};
369396
assert!(matches!(
370397
pkt.validate().unwrap_err(),
371-
Ac7ProtocolError::OutOfRange { field: "state.roll_deg", .. }
398+
Ac7ProtocolError::OutOfRange {
399+
field: "state.roll_deg",
400+
..
401+
}
372402
));
373403
}
374404

@@ -397,7 +427,10 @@ fn rejects_g_force_beyond_bounds() {
397427
};
398428
assert!(matches!(
399429
pkt.validate().unwrap_err(),
400-
Ac7ProtocolError::OutOfRange { field: "state.g_force", .. }
430+
Ac7ProtocolError::OutOfRange {
431+
field: "state.g_force",
432+
..
433+
}
401434
));
402435
}
403436

@@ -426,7 +459,10 @@ fn rejects_health_norm_negative() {
426459
};
427460
assert!(matches!(
428461
pkt.validate().unwrap_err(),
429-
Ac7ProtocolError::OutOfRange { field: "state.health_norm", .. }
462+
Ac7ProtocolError::OutOfRange {
463+
field: "state.health_norm",
464+
..
465+
}
430466
));
431467
}
432468

@@ -441,7 +477,10 @@ fn rejects_health_norm_above_one() {
441477
};
442478
assert!(matches!(
443479
pkt.validate().unwrap_err(),
444-
Ac7ProtocolError::OutOfRange { field: "state.health_norm", .. }
480+
Ac7ProtocolError::OutOfRange {
481+
field: "state.health_norm",
482+
..
483+
}
445484
));
446485
}
447486

@@ -475,7 +514,10 @@ fn rejects_pitch_below_neg_one() {
475514
};
476515
assert!(matches!(
477516
pkt.validate().unwrap_err(),
478-
Ac7ProtocolError::OutOfRange { field: "controls.pitch", .. }
517+
Ac7ProtocolError::OutOfRange {
518+
field: "controls.pitch",
519+
..
520+
}
479521
));
480522
}
481523

@@ -490,7 +532,10 @@ fn rejects_roll_above_one() {
490532
};
491533
assert!(matches!(
492534
pkt.validate().unwrap_err(),
493-
Ac7ProtocolError::OutOfRange { field: "controls.roll", .. }
535+
Ac7ProtocolError::OutOfRange {
536+
field: "controls.roll",
537+
..
538+
}
494539
));
495540
}
496541

@@ -505,7 +550,10 @@ fn rejects_yaw_out_of_range() {
505550
};
506551
assert!(matches!(
507552
pkt.validate().unwrap_err(),
508-
Ac7ProtocolError::OutOfRange { field: "controls.yaw", .. }
553+
Ac7ProtocolError::OutOfRange {
554+
field: "controls.yaw",
555+
..
556+
}
509557
));
510558
}
511559

@@ -520,7 +568,10 @@ fn rejects_brake_negative() {
520568
};
521569
assert!(matches!(
522570
pkt.validate().unwrap_err(),
523-
Ac7ProtocolError::OutOfRange { field: "controls.brake", .. }
571+
Ac7ProtocolError::OutOfRange {
572+
field: "controls.brake",
573+
..
574+
}
524575
));
525576
}
526577

@@ -535,7 +586,10 @@ fn rejects_throttle_above_one() {
535586
};
536587
assert!(matches!(
537588
pkt.validate().unwrap_err(),
538-
Ac7ProtocolError::OutOfRange { field: "controls.throttle", .. }
589+
Ac7ProtocolError::OutOfRange {
590+
field: "controls.throttle",
591+
..
592+
}
539593
));
540594
}
541595

crates/flight-adapter-common/tests/depth_tests.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ impl MockAdapter {
184184
AdapterState::Disconnected | AdapterState::Error => {
185185
self.state = AdapterState::Connecting;
186186
self.state = AdapterState::Error;
187-
self.last_error =
188-
Some(AdapterError::Timeout("connection timed out".to_string()));
187+
self.last_error = Some(AdapterError::Timeout("connection timed out".to_string()));
189188
Err(AdapterError::Timeout("connection timed out".to_string()))
190189
}
191190
_ => Err(AdapterError::NotConnected),
@@ -344,11 +343,7 @@ fn state_machine_timeout_on_connecting() {
344343

345344
#[test]
346345
fn reconnection_strategy_should_retry_within_limit() {
347-
let s = ReconnectionStrategy::new(
348-
5,
349-
Duration::from_millis(100),
350-
Duration::from_millis(5000),
351-
);
346+
let s = ReconnectionStrategy::new(5, Duration::from_millis(100), Duration::from_millis(5000));
352347
assert!(s.should_retry(5));
353348
assert!(!s.should_retry(6));
354349
}
@@ -386,10 +381,7 @@ fn backoff_caps_at_max_delay() {
386381

387382
#[test]
388383
fn adapter_error_all_variants_format_without_panic() {
389-
let errors = vec![
390-
AdapterError::NotConnected,
391-
AdapterError::ReconnectExhausted,
392-
];
384+
let errors = vec![AdapterError::NotConnected, AdapterError::ReconnectExhausted];
393385
for e in errors {
394386
let _ = format!("{}", e);
395387
let _ = format!("{:?}", e);

crates/flight-aerofly/tests/depth_tests.rs

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
//! and property-based invariants.
99
1010
use flight_aerofly::{
11-
AEROFLY_DEFAULT_PORT, AEROFLY_MAGIC, AeroflyAdapter, AeroflyAdapterError,
12-
AeroflyAircraftType, AeroflyTelemetry, MIN_FRAME_SIZE, parse_json_telemetry,
13-
parse_telemetry, parse_text_telemetry,
11+
AEROFLY_DEFAULT_PORT, AEROFLY_MAGIC, AeroflyAdapter, AeroflyAdapterError, AeroflyAircraftType,
12+
AeroflyTelemetry, MIN_FRAME_SIZE, parse_json_telemetry, parse_telemetry, parse_text_telemetry,
1413
};
1514
use proptest::prelude::*;
1615

@@ -152,7 +151,13 @@ fn truncated_at_each_field_boundary() {
152151

153152
#[test]
154153
fn magic_variants_all_rejected() {
155-
let magics: [u32; 5] = [0x0000_0000, 0xFFFF_FFFF, 0x4146_4652, 0x5346_4641, 0x4146_4654];
154+
let magics: [u32; 5] = [
155+
0x0000_0000,
156+
0xFFFF_FFFF,
157+
0x4146_4652,
158+
0x5346_4641,
159+
0x4146_4654,
160+
];
156161
for magic in magics {
157162
let mut data = build_frame(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0, 0.0);
158163
data[0..4].copy_from_slice(&magic.to_le_bytes());
@@ -282,9 +287,7 @@ fn error_display_frame_too_short() {
282287

283288
#[test]
284289
fn error_display_bad_magic() {
285-
let err = AeroflyAdapterError::BadMagic {
286-
found: 0xDEAD_BEEF,
287-
};
290+
let err = AeroflyAdapterError::BadMagic { found: 0xDEAD_BEEF };
288291
let msg = err.to_string();
289292
assert!(msg.contains("0xdeadbeef") || msg.contains("DEADBEEF") || msg.contains("deadbeef"));
290293
}
@@ -598,7 +601,10 @@ fn conversion_pitch_roll_symmetry() {
598601
roll: -45.0,
599602
..Default::default()
600603
};
601-
assert!((t.pitch_rad() + t.roll_rad()).abs() < 0.001, "±45° should cancel");
604+
assert!(
605+
(t.pitch_rad() + t.roll_rad()).abs() < 0.001,
606+
"±45° should cancel"
607+
);
602608
}
603609

604610
// ── Property-based tests ───────────────────────────────────────────────────────
@@ -746,7 +752,10 @@ fn telemetry_clone_is_independent() {
746752
};
747753
let t2 = t1.clone();
748754
t1.pitch = 20.0;
749-
assert!((t2.pitch - 10.0).abs() < 0.01, "clone should be independent");
755+
assert!(
756+
(t2.pitch - 10.0).abs() < 0.01,
757+
"clone should be independent"
758+
);
750759
assert!((t1.pitch - 20.0).abs() < 0.01);
751760
}
752761

@@ -768,5 +777,8 @@ fn telemetry_debug_contains_field_names() {
768777
#[test]
769778
fn adapter_port_accessible() {
770779
let adapter = AeroflyAdapter::new();
771-
assert_eq!(adapter.port, AEROFLY_DEFAULT_PORT, "default port should match constant");
780+
assert_eq!(
781+
adapter.port, AEROFLY_DEFAULT_PORT,
782+
"default port should match constant"
783+
);
772784
}

0 commit comments

Comments
 (0)