From 53ba2e005bab2451ba286b502a8e88e09718a8a2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 Feb 2024 18:53:03 +0100 Subject: [PATCH] auto-formatting --- satrs-example/src/events.rs | 5 ++++- satrs-example/src/pus/action.rs | 3 ++- satrs-example/src/pus/hk.rs | 3 ++- satrs-example/src/pus/mod.rs | 4 +++- satrs-example/src/pus/test.rs | 4 +++- satrs/src/pus/verification.rs | 18 +++++++++--------- satrs/tests/pus_verification.rs | 3 ++- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/satrs-example/src/events.rs b/satrs-example/src/events.rs index 617f430..f1c3286 100644 --- a/satrs-example/src/events.rs +++ b/satrs-example/src/events.rs @@ -12,7 +12,10 @@ use satrs::{ DefaultPusMgmtBackendProvider, EventReporter, EventRequest, EventRequestWithToken, PusEventDispatcher, }, - verification::{TcStateStarted, VerificationReporterWithSender, VerificationToken, VerificationReportingProvider}, + verification::{ + TcStateStarted, VerificationReporterWithSender, VerificationReportingProvider, + VerificationToken, + }, EcssTmSender, }, spacepackets::time::cds::{self, TimeProvider}, diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index a7cfac2..fd196dd 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -3,7 +3,8 @@ use satrs::action::ActionRequest; use satrs::pool::{SharedStaticMemoryPool, StoreAddr}; use satrs::pus::action::{PusActionToRequestConverter, PusService8ActionHandler}; use satrs::pus::verification::{ - FailParams, TcStateAccepted, VerificationReporterWithSender, VerificationToken, VerificationReportingProvider, + FailParams, TcStateAccepted, VerificationReporterWithSender, VerificationReportingProvider, + VerificationToken, }; use satrs::pus::{ EcssTcAndToken, EcssTcInMemConverter, EcssTcInSharedStoreConverter, EcssTcInVecConverter, diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index f18e611..f82c89a 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -3,7 +3,8 @@ use satrs::hk::{CollectionIntervalFactor, HkRequest}; use satrs::pool::{SharedStaticMemoryPool, StoreAddr}; use satrs::pus::hk::{PusHkToRequestConverter, PusService3HkHandler}; use satrs::pus::verification::{ - FailParams, TcStateAccepted, VerificationReporterWithSender, VerificationToken, VerificationReportingProvider, + FailParams, TcStateAccepted, VerificationReporterWithSender, VerificationReportingProvider, + VerificationToken, }; use satrs::pus::{ EcssTcAndToken, EcssTcInMemConverter, EcssTcInSharedStoreConverter, EcssTcInVecConverter, diff --git a/satrs-example/src/pus/mod.rs b/satrs-example/src/pus/mod.rs index ef1396f..5688492 100644 --- a/satrs-example/src/pus/mod.rs +++ b/satrs-example/src/pus/mod.rs @@ -1,6 +1,8 @@ use crate::tmtc::MpscStoreAndSendError; use log::warn; -use satrs::pus::verification::{FailParams, StdVerifReporterWithSender, VerificationReportingProvider}; +use satrs::pus::verification::{ + FailParams, StdVerifReporterWithSender, VerificationReportingProvider, +}; use satrs::pus::{ EcssTcAndToken, GenericRoutingError, PusPacketHandlerResult, PusRoutingErrorHandler, TcInMemory, }; diff --git a/satrs-example/src/pus/test.rs b/satrs-example/src/pus/test.rs index 3894b81..ab308a7 100644 --- a/satrs-example/src/pus/test.rs +++ b/satrs-example/src/pus/test.rs @@ -2,7 +2,9 @@ use log::{info, warn}; use satrs::params::Params; use satrs::pool::{SharedStaticMemoryPool, StoreAddr}; use satrs::pus::test::PusService17TestHandler; -use satrs::pus::verification::{FailParams, VerificationReporterWithSender, VerificationReportingProvider}; +use satrs::pus::verification::{ + FailParams, VerificationReporterWithSender, VerificationReportingProvider, +}; use satrs::pus::{ EcssTcAndToken, EcssTcInMemConverter, EcssTcInVecConverter, MpscTcReceiver, MpscTmAsVecSender, MpscTmInSharedPoolSender, PusPacketHandlerResult, PusServiceHelper, diff --git a/satrs/src/pus/verification.rs b/satrs/src/pus/verification.rs index 236ec7e..4b88a91 100644 --- a/satrs/src/pus/verification.rs +++ b/satrs/src/pus/verification.rs @@ -1982,15 +1982,15 @@ mod tests { let started_token = b.vr.start_success(accepted_token, &sender, Some(&[0, 1, 0, 1, 0, 1, 0])) .expect("Sending start success failed"); - b.vr.step_success( - &started_token, - &mut sender, - Some(&EMPTY_STAMP), - EcssEnumU8::new(0), - ) - .expect("Sending completion success failed"); - b.vr.step_failure(started_token, &sender, fail_params) - .expect("Step failure failed"); + b.vr.step_success( + &started_token, + &mut sender, + Some(&EMPTY_STAMP), + EcssEnumU8::new(0), + ) + .expect("Sending completion success failed"); + b.vr.step_failure(started_token, &sender, fail_params) + .expect("Step failure failed"); check_step_failure(&mut sender, req_id, fail_data_raw); } diff --git a/satrs/tests/pus_verification.rs b/satrs/tests/pus_verification.rs index f1b5fca..c777c61 100644 --- a/satrs/tests/pus_verification.rs +++ b/satrs/tests/pus_verification.rs @@ -3,7 +3,8 @@ pub mod crossbeam_test { use hashbrown::HashMap; use satrs::pool::{PoolProvider, PoolProviderWithGuards, StaticMemoryPool, StaticPoolConfig}; use satrs::pus::verification::{ - FailParams, RequestId, VerificationReporterCfg, VerificationReporterWithSender, VerificationReportingProvider, + FailParams, RequestId, VerificationReporterCfg, VerificationReporterWithSender, + VerificationReportingProvider, }; use satrs::pus::CrossbeamTmInStoreSender; use satrs::tmtc::tm_helper::SharedTmPool;