bump spacepackets, clippy fixes

This commit is contained in:
2022-08-16 11:15:23 +02:00
parent 65cbb1411c
commit 1bf8138a94
10 changed files with 20 additions and 36 deletions

View File

@ -5,7 +5,7 @@ pub type GroupId = u16;
pub type UniqueId = u16;
pub type EventRaw = u32;
#[derive(Copy, Clone, PartialEq, Debug)]
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum Severity {
INFO = 1,
LOW = 2,
@ -27,7 +27,7 @@ impl TryFrom<u8> for Severity {
}
}
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub struct Event {
severity: Severity,
group_id: GroupId,

View File

@ -6,7 +6,7 @@ use std::thread;
use std::thread::JoinHandle;
use std::time::Duration;
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
pub enum OpResult {
Ok,
TerminationRequested,

View File

@ -110,7 +110,7 @@ pub struct LocalPool {
}
/// Simple address type used for transactions with the local pool.
#[derive(Debug, Copy, Clone, PartialEq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct StoreAddr {
pool_idx: u16,
packet_idx: NumBlocks,
@ -124,13 +124,13 @@ impl StoreAddr {
}
}
#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum StoreIdError {
InvalidSubpool(u16),
InvalidPacketIdx(u16),
}
#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum StoreError {
/// Requested data block is too large
DataTooLarge(usize),

View File

@ -121,7 +121,7 @@ pub struct CcsdsDistributor<E> {
pub apid_handler: Box<dyn ApidPacketHandler<Error = E>>,
}
#[derive(Debug, Copy, Clone, PartialEq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum CcsdsError<E> {
CustomError(E),
PacketError(PacketError),

View File

@ -87,13 +87,13 @@ impl<E> PusDistributor<E> {
}
}
#[derive(Debug, Copy, Clone, PartialEq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum PusDistribError<E> {
CustomError(E),
PusError(PusError),
}
impl<E> ReceivesTc for PusDistributor<E> {
impl<E: 'static> ReceivesTc for PusDistributor<E> {
type Error = PusDistribError<E>;
fn pass_tc(&mut self, tm_raw: &[u8]) -> Result<(), Self::Error> {
// Convert to ccsds and call pass_ccsds
@ -103,7 +103,7 @@ impl<E> ReceivesTc for PusDistributor<E> {
}
}
impl<E> ReceivesCcsdsTc for PusDistributor<E> {
impl<E: 'static> ReceivesCcsdsTc for PusDistributor<E> {
type Error = PusDistribError<E>;
fn pass_ccsds(&mut self, header: &SpHeader, tm_raw: &[u8]) -> Result<(), Self::Error> {
let (tc, _) =
@ -112,7 +112,7 @@ impl<E> ReceivesCcsdsTc for PusDistributor<E> {
}
}
impl<E> ReceivesEcssPusTc for PusDistributor<E> {
impl<E: 'static> ReceivesEcssPusTc for PusDistributor<E> {
type Error = PusDistribError<E>;
fn pass_pus_tc(&mut self, header: &SpHeader, pus_tc: &PusTc) -> Result<(), Self::Error> {
self.service_provider