rust/spacepackets
6
1
Fork 0
Code Issues Pull Requests Projects Releases 29 Wiki Activity

Merge remote-tracking branch 'origin/main' into refactoring-ecss-packet-mods

Browse Source
This commit is contained in:
Robin Müller
2023-07-10 00:38:07 +02:00
parent defd7609e7 f117c8c4de
commit fd95c86294
7 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ecss/mod.rs
View File

@ -151,7 +151,7 @@ pub enum PusError {
NoRawData,
/// CRC16 needs to be calculated first
CrcCalculationMissing,
ByteConversionError(ByteConversionError),
ByteConversion(ByteConversionError),
}
impl Display for PusError {
@ -175,7 +175,7 @@ impl Display for PusError {
PusError::CrcCalculationMissing => {
write!(f, "crc16 was not calculated")
}
PusError::ByteConversionError(e) => {
PusError::ByteConversion(e) => {
write!(f, "low level byte conversion error: {e}")
}
}
@ -185,7 +185,7 @@ impl Display for PusError {
#[cfg(feature = "std")]
impl Error for PusError {
fn source(&self) -> Option<&(dyn Error + 'static)> {
if let PusError::ByteConversionError(e) = self {
if let PusError::ByteConversion(e) = self {
return Some(e);
}
None
@ -194,7 +194,7 @@ impl Error for PusError {
impl From<ByteConversionError> for PusError {
fn from(e: ByteConversionError) -> Self {
PusError::ByteConversionError(e)
PusError::ByteConversion(e)
}
}

4
src/ecss/tm.rs
View File

@ -686,9 +686,9 @@ mod tests {
let res = pus_tm.write_to_bytes(&mut buf);
assert!(res.is_err());
let error = res.unwrap_err();
assert!(matches!(error, PusError::ByteConversionError { .. }));
assert!(matches!(error, PusError::ByteConversion { .. }));
match error {
PusError::ByteConversionError(err) => match err {
PusError::ByteConversion(err) => match err {
ByteConversionError::ToSliceTooSmall(size_missmatch) => {
assert_eq!(size_missmatch.expected, 22);
assert_eq!(size_missmatch.found, 16);