From fe7c221941293229bc38900b32a804baf228e673 Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 21 Jul 2026 13:51:33 -0700 Subject: [PATCH] rustfmt Created using spr 1.3.6-beta.1 --- .../versions/src/impls/inventory.rs | 4 +- .../versions/src/latest.rs | 2 +- wicketd/src/commission/conversions.rs | 65 ++++++++++--------- wicketd/tests/integration_tests/commission.rs | 3 +- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/wicketd-commission-types/versions/src/impls/inventory.rs b/wicketd-commission-types/versions/src/impls/inventory.rs index 8efa0b47a76..eb01d978190 100644 --- a/wicketd-commission-types/versions/src/impls/inventory.rs +++ b/wicketd-commission-types/versions/src/impls/inventory.rs @@ -165,9 +165,7 @@ mod tests { }, CmisDatapath { application: 2, - lanes: [lane(0, FaultFlag::Unsupported)] - .into_iter() - .collect(), + lanes: [lane(0, FaultFlag::Unsupported)].into_iter().collect(), }, ] .into_iter() diff --git a/wicketd-commission-types/versions/src/latest.rs b/wicketd-commission-types/versions/src/latest.rs index b2ba0207e02..2a7ea8ec6b0 100644 --- a/wicketd-commission-types/versions/src/latest.rs +++ b/wicketd-commission-types/versions/src/latest.rs @@ -16,6 +16,7 @@ pub mod inventory { pub use crate::v1::inventory::PowerState; pub use crate::v1::inventory::RotInfo; pub use crate::v1::inventory::RotSlot; + pub use crate::v1::inventory::Sff8636LaneFaults; pub use crate::v1::inventory::SlotCaboose; pub use crate::v1::inventory::SpIdentifier; pub use crate::v1::inventory::SpIgnitionInfo; @@ -24,7 +25,6 @@ pub mod inventory { pub use crate::v1::inventory::SpInventoryParams; pub use crate::v1::inventory::SpStateInfo; pub use crate::v1::inventory::SpType; - pub use crate::v1::inventory::Sff8636LaneFaults; pub use crate::v1::inventory::Stage0Caboose; pub use crate::v1::inventory::SwitchSlot; pub use crate::v1::inventory::SwitchTransceivers; diff --git a/wicketd/src/commission/conversions.rs b/wicketd/src/commission/conversions.rs index b7db80f9507..4852e468b6b 100644 --- a/wicketd/src/commission/conversions.rs +++ b/wicketd/src/commission/conversions.rs @@ -206,15 +206,16 @@ fn transceiver_vendor_to_ct( match vendor { Err(message) => ct_inv::TransceiverVendor::Error { message }, Ok(VendorInfo { - vendor: Vendor { - name, - part, - serial, - // The remaining vendor fields are not projected. - oui: _, - revision: _, - date: _, - }, + vendor: + Vendor { + name, + part, + serial, + // The remaining vendor fields are not projected. + oui: _, + revision: _, + date: _, + }, // The SFF-8024 identifier is not projected. identifier: _, }) => ct_inv::TransceiverVendor::Read { name, part, serial }, @@ -248,19 +249,11 @@ fn transceiver_datapath_to_ct( ) -> ct_inv::TransceiverDatapath { match datapath { Err(message) => ct_inv::TransceiverDatapath::Error { message }, - Ok(Datapath::Sff8636 { - lanes, - connector: _, - specification: _, - }) => { + Ok(Datapath::Sff8636 { lanes, connector: _, specification: _ }) => { let lanes = lanes.map(sff8636_lane_to_ct); ct_inv::TransceiverDatapath::Sff8636 { lanes } } - Ok(Datapath::Cmis { - datapaths, - connector: _, - supported_lanes: _, - }) => { + Ok(Datapath::Cmis { datapaths, connector: _, supported_lanes: _ }) => { let datapaths = IdOrdMap::from_iter_unique( datapaths.into_iter().map(|(application, datapath)| { cmis_datapath_to_ct(application, datapath) @@ -309,10 +302,7 @@ fn cmis_datapath_to_ct( ct_inv::CmisDatapath { application, lanes } } -fn cmis_lane_to_ct( - lane: u8, - status: CmisLaneStatus, -) -> ct_inv::CmisLaneStatus { +fn cmis_lane_to_ct(lane: u8, status: CmisLaneStatus) -> ct_inv::CmisLaneStatus { let CmisLaneStatus { state, rx_los, @@ -440,8 +430,8 @@ mod tests { use std::time::Duration; use transceiver_controller::{ ApplicationDescriptor, CmisDatapathState, ConnectorType, - HostElectricalInterfaceId, Identifier, MediaInterfaceId, MediaType, Oui, - OutputStatus, ReceiverPower, SffComplianceCode, + HostElectricalInterfaceId, Identifier, MediaInterfaceId, MediaType, + Oui, OutputStatus, ReceiverPower, SffComplianceCode, }; fn sample_application_descriptor() -> ApplicationDescriptor { @@ -524,8 +514,9 @@ mod tests { #[test] fn transceiver_status_projects_flags() { assert_eq!( - transceiver_status_to_ct(Ok(ExtendedStatus::PRESENT - | ExtendedStatus::POWER_GOOD)), + transceiver_status_to_ct(Ok( + ExtendedStatus::PRESENT | ExtendedStatus::POWER_GOOD + )), ct_inv::TransceiverStatus::Read { present: true, enabled: false, @@ -677,13 +668,25 @@ mod tests { #[test] fn cmis_datapath_state_maps_all_variants() { let cases = [ - (CmisDatapathState::Deactivated, ct_inv::CmisDatapathState::Deactivated), + ( + CmisDatapathState::Deactivated, + ct_inv::CmisDatapathState::Deactivated, + ), (CmisDatapathState::Init, ct_inv::CmisDatapathState::Init), (CmisDatapathState::Deinit, ct_inv::CmisDatapathState::Deinit), - (CmisDatapathState::Activated, ct_inv::CmisDatapathState::Activated), + ( + CmisDatapathState::Activated, + ct_inv::CmisDatapathState::Activated, + ), (CmisDatapathState::TxTurnOn, ct_inv::CmisDatapathState::TxTurnOn), - (CmisDatapathState::TxTurnOff, ct_inv::CmisDatapathState::TxTurnOff), - (CmisDatapathState::Initialized, ct_inv::CmisDatapathState::Initialized), + ( + CmisDatapathState::TxTurnOff, + ct_inv::CmisDatapathState::TxTurnOff, + ), + ( + CmisDatapathState::Initialized, + ct_inv::CmisDatapathState::Initialized, + ), ]; for (internal, expected) in cases { assert_eq!(cmis_datapath_state_to_ct(internal), expected); diff --git a/wicketd/tests/integration_tests/commission.rs b/wicketd/tests/integration_tests/commission.rs index 981f750cf41..fd68ab97da8 100644 --- a/wicketd/tests/integration_tests/commission.rs +++ b/wicketd/tests/integration_tests/commission.rs @@ -101,7 +101,8 @@ async fn test_commission_inventory() { "sled 0 state as reported by sp-sim" ); - let SlotCaboose::Read { caboose: sp_caboose } = &sled0.caboose_active else { + let SlotCaboose::Read { caboose: sp_caboose } = &sled0.caboose_active + else { panic!("sled 0 active SP caboose should be read: {sled0:?}"); }; assert_eq!(