cargo fmt and cargo clippy

src/pus/mod.rs

@@ -1,8 +1,12 @@
-pub mod test;
 pub mod stack;
+pub mod test;
 
 use crate::requests::GenericRequestRouter;
+use crate::tmtc::MpscStoreAndSendError;
 use log::warn;
+use ops_sat_rs::config::components::PUS_ROUTING_SERVICE;
+use ops_sat_rs::config::{tmtc_err, CustomPusServiceId};
+use ops_sat_rs::TimeStampHelper;
 use satrs::pus::verification::{
     self, FailParams, TcStateAccepted, TcStateStarted, VerificationReporter,
     VerificationReporterCfg, VerificationReportingProvider, VerificationToken,
@@ -18,12 +22,8 @@ use satrs::request::{Apid, GenericMessage, MessageMetadata};
 use satrs::spacepackets::ecss::tc::PusTcReader;
 use satrs::spacepackets::ecss::PusServiceId;
 use satrs::ComponentId;
-use ops_sat_rs::config::{tmtc_err, CustomPusServiceId};
-use ops_sat_rs::TimeStampHelper;
 use std::fmt::Debug;
 use std::sync::mpsc::{self, Sender};
-use ops_sat_rs::config::components::PUS_ROUTING_SERVICE;
-use crate::tmtc::MpscStoreAndSendError;
 
 // pub mod action;
 // pub mod event;
@@ -34,6 +34,7 @@ use crate::tmtc::MpscStoreAndSendError;
 // pub mod test;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
+#[allow(dead_code)]
 pub enum HandlingStatus {
     Empty,
     HandledOne,
@@ -185,6 +186,7 @@ pub trait TargetedPusService {
 ///  1. [Self::handle_one_tc] which tries to poll and handle one TC packet, covering steps 1-5.
 ///  2. [Self::check_one_reply] which tries to poll and handle one reply, covering step 6.
 ///  3. [Self::check_for_request_timeouts] which checks for request timeouts, covering step 7.
+#[allow(dead_code)]
 pub struct PusTargetedRequestService<
     TcReceiver: EcssTcReceiverCore,
     TmSender: EcssTmSenderCore,
@@ -207,6 +209,7 @@ pub struct PusTargetedRequestService<
     phantom: std::marker::PhantomData<(RequestType, ActiveRequestInfo, ReplyType)>,
 }
 
+#[allow(dead_code)]
 impl<
         TcReceiver: EcssTcReceiverCore,
         TmSender: EcssTmSenderCore,
@@ -437,6 +440,7 @@ where
 
 /// Generic timeout handling: Handle the verification failure with a dedicated return code
 /// and also log the error.
+#[allow(dead_code)]
 pub fn generic_pus_request_timeout_handler(
     sender: &(impl EcssTmSenderCore + ?Sized),
     active_request: &(impl ActiveRequestProvider + Debug),

src/pus/stack.rs

@@ -1,11 +1,11 @@
 // use crate::pus::mode::ModeServiceWrapper;
+use crate::pus::test::TestCustomServiceWrapper;
+use crate::pus::HandlingStatus;
 use derive_new::new;
 use satrs::{
     pus::{EcssTcInMemConverter, EcssTmSenderCore},
     spacepackets::time::{cds, TimeWriter},
 };
-use crate::pus::HandlingStatus;
-use crate::pus::test::TestCustomServiceWrapper;
 
 // use super::{
 //     action::ActionServiceWrapper, event::EventServiceWrapper, hk::HkServiceWrapper,

src/pus/test.rs

@@ -1,29 +1,25 @@
 use crate::pus::create_verification_reporter;
 use log::{info, warn};
-use satrs::event_man::{EventMessage, EventMessageU32};
-use satrs::pool::SharedStaticMemoryPool;
+use ops_sat_rs::config::components::PUS_TEST_SERVICE;
+use ops_sat_rs::config::tmtc_err;
+// use satrs::event_man::{EventMessage, EventMessageU32};
 use satrs::pus::test::PusService17TestHandler;
 use satrs::pus::verification::{FailParams, VerificationReporter, VerificationReportingProvider};
-use satrs::pus::EcssTcInSharedStoreConverter;
 use satrs::pus::{
     EcssTcAndToken, EcssTcInMemConverter, EcssTcInVecConverter, EcssTmSenderCore, MpscTcReceiver,
-    MpscTmAsVecSender, MpscTmInSharedPoolSenderBounded, PusPacketHandlerResult, PusServiceHelper,
-    PusTmAsVec, PusTmInPool, TmInSharedPoolSender,
+    MpscTmAsVecSender, PusPacketHandlerResult, PusServiceHelper, PusTmAsVec,
 };
 use satrs::spacepackets::ecss::tc::PusTcReader;
 use satrs::spacepackets::ecss::PusPacket;
 use satrs::spacepackets::time::cds::CdsTime;
 use satrs::spacepackets::time::TimeWriter;
 use std::sync::mpsc;
-use std::sync::mpsc::Sender;
-use ops_sat_rs::config::components::PUS_TEST_SERVICE;
-use ops_sat_rs::config::tmtc_err;
 
 pub fn create_test_service_dynamic(
     tm_funnel_tx: mpsc::Sender<PusTmAsVec>,
     // event_sender: mpsc::Sender<EventMessageU32>,
     pus_test_rx: mpsc::Receiver<EcssTcAndToken>,
-) -> TestCustomServiceWrapper<Sender<PusTmAsVec>, EcssTcInVecConverter> {
+) -> TestCustomServiceWrapper<MpscTmAsVecSender, EcssTcInVecConverter> {
     let pus17_handler = PusService17TestHandler::new(PusServiceHelper::new(
         PUS_TEST_SERVICE.id(),
         pus_test_rx,