diff --git a/satrs-core/src/event_man.rs b/satrs-core/src/event_man.rs index 3219c0b..530df51 100644 --- a/satrs-core/src/event_man.rs +++ b/satrs-core/src/event_man.rs @@ -211,9 +211,9 @@ impl>) -> Self { - let listener_table = Box::new(DefaultListenerTableProvider::default()); - let sender_table = - Box::new(DefaultSenderTableProvider::::default()); + let listener_table: Box = Box::default(); + let sender_table: Box> = + Box::default(); Self::new_custom_tables(listener_table, sender_table, event_receiver) } } diff --git a/satrs-core/src/events.rs b/satrs-core/src/events.rs index 1c06945..ae0452c 100644 --- a/satrs-core/src/events.rs +++ b/satrs-core/src/events.rs @@ -136,17 +136,14 @@ impl EventBase { impl EventBase { #[inline] fn raw(&self) -> u32 { - (((self.severity as u32) << 30) | ((self.group_id as u32) << 16) | self.unique_id as u32) - as u32 + ((self.severity as u32) << 30) | ((self.group_id as u32) << 16) | self.unique_id as u32 } } impl EventBase { #[inline] fn raw(&self) -> u16 { - (((self.severity as u16) << 14) as u16 - | ((self.group_id as u16) << 8) as u16 - | self.unique_id as u16) as u16 + ((self.severity as u16) << 14) | ((self.group_id as u16) << 8) | self.unique_id as u16 } } diff --git a/satrs-core/src/pool.rs b/satrs-core/src/pool.rs index 70d9dcd..ebc404e 100644 --- a/satrs-core/src/pool.rs +++ b/satrs-core/src/pool.rs @@ -136,7 +136,7 @@ impl StoreAddr { pub const INVALID_ADDR: u32 = 0xFFFFFFFF; pub fn raw(&self) -> u32 { - ((self.pool_idx as u32) << 16) as u32 | self.packet_idx as u32 + ((self.pool_idx as u32) << 16) | self.packet_idx as u32 } } @@ -239,7 +239,7 @@ impl LocalPool { fn validate_addr(&self, addr: &StoreAddr) -> Result<(), StoreError> { let pool_idx = addr.pool_idx as usize; - if pool_idx as usize >= self.pool_cfg.cfg.len() { + if pool_idx >= self.pool_cfg.cfg.len() { return Err(StoreError::InvalidStoreId( StoreIdError::InvalidSubpool(addr.pool_idx), Some(*addr), diff --git a/satrs-core/src/pus/verification.rs b/satrs-core/src/pus/verification.rs index b2466c3..1da862b 100644 --- a/satrs-core/src/pus/verification.rs +++ b/satrs-core/src/pus/verification.rs @@ -569,7 +569,7 @@ impl VerificationReporterBasic { ) -> Result> { let mut source_data_len = size_of::(); if let Some(step) = step { - source_data_len += step.byte_width() as usize; + source_data_len += step.byte_width(); } source_buffer_large_enough(buf.len(), source_data_len)?; let mut idx = 0; @@ -577,7 +577,7 @@ impl VerificationReporterBasic { idx += RequestId::SIZE_AS_BYTES; if let Some(step) = step { // Size check was done beforehand - step.write_to_be_bytes(&mut buf[idx..idx + step.byte_width() as usize]) + step.write_to_be_bytes(&mut buf[idx..idx + step.byte_width()]) .unwrap(); } let mut sp_header = SpHeader::tm_unseg(self.apid(), 0, 0).unwrap(); @@ -601,10 +601,9 @@ impl VerificationReporterBasic { params: &'a FailParams, ) -> Result> { let mut idx = 0; - let mut source_data_len = - RequestId::SIZE_AS_BYTES + params.failure_code.byte_width() as usize; + let mut source_data_len = RequestId::SIZE_AS_BYTES + params.failure_code.byte_width(); if let Some(step) = step { - source_data_len += step.byte_width() as usize; + source_data_len += step.byte_width(); } if let Some(failure_data) = params.failure_data { source_data_len += failure_data.len(); @@ -614,14 +613,14 @@ impl VerificationReporterBasic { idx += RequestId::SIZE_AS_BYTES; if let Some(step) = step { // Size check done beforehand - step.write_to_be_bytes(&mut buf[idx..idx + step.byte_width() as usize]) + step.write_to_be_bytes(&mut buf[idx..idx + step.byte_width()]) .unwrap(); - idx += step.byte_width() as usize; + idx += step.byte_width(); } params .failure_code - .write_to_be_bytes(&mut buf[idx..idx + params.failure_code.byte_width() as usize])?; - idx += params.failure_code.byte_width() as usize; + .write_to_be_bytes(&mut buf[idx..idx + params.failure_code.byte_width()])?; + idx += params.failure_code.byte_width(); if let Some(failure_data) = params.failure_data { buf[idx..idx + failure_data.len()].copy_from_slice(failure_data); } @@ -709,8 +708,8 @@ mod allocmod { source_data_buf: vec![ 0; RequestId::SIZE_AS_BYTES - + cfg.step_field_width as usize - + cfg.fail_code_field_width as usize + + cfg.step_field_width + + cfg.fail_code_field_width + cfg.max_fail_data_len ], seq_counter: cfg.seq_counter.clone(), diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 3f069fd..848246b 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -83,6 +83,7 @@ fn main() { let sender = MpscVerifSender::new(tm_store.clone(), tm_funnel_tx.clone()); let verif_cfg = VerificationReporterCfg::new( PUS_APID, + #[allow(clippy::box_default)] Box::new(SimpleSeqCountProvider::default()), 1, 2, diff --git a/satrs-example/src/pus.rs b/satrs-example/src/pus.rs index bc5caf2..9167935 100644 --- a/satrs-example/src/pus.rs +++ b/satrs-example/src/pus.rs @@ -149,7 +149,7 @@ impl PusReceiver { .expect("Sending start failure TM failed"); return; } - let addressable_id = AddressableId::from_raw_be(&user_data).unwrap(); + let addressable_id = AddressableId::from_raw_be(user_data).unwrap(); if !self.request_map.contains_key(&addressable_id.target_id) { self.update_time_stamp(); self.verif_reporter @@ -160,27 +160,18 @@ impl PusReceiver { .expect("Sending start failure TM failed"); return; } + let send_request = |request: HkRequest| { + let sender = self.request_map.get(&addressable_id.target_id).unwrap(); + sender + .send(Request::HkRequest(request)) + .expect(&format!("Sending HK request {:?} failed", request)) + }; if PusPacket::subservice(pus_tc) == hk::Subservice::TcEnableGeneration as u8 { - let sender = self.request_map.get(&addressable_id.target_id).unwrap(); - sender - .send(Request::HkRequest(HkRequest::Enable( - addressable_id.unique_id, - ))) - .expect("Sending HK request failed") + send_request(HkRequest::Enable(addressable_id.unique_id)); } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcDisableGeneration as u8 { - let sender = self.request_map.get(&addressable_id.target_id).unwrap(); - sender - .send(Request::HkRequest(HkRequest::Disable( - addressable_id.unique_id, - ))) - .expect("Sending HK request failed"); + send_request(HkRequest::Disable(addressable_id.unique_id)); } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcGenerateOneShotHk as u8 { - let sender = self.request_map.get(&addressable_id.target_id).unwrap(); - sender - .send(Request::HkRequest(HkRequest::OneShot( - addressable_id.unique_id, - ))) - .expect("Sending HK request failed"); + send_request(HkRequest::OneShot(addressable_id.unique_id)); } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcModifyCollectionInterval as u8 { if user_data.len() < 12 {}