rust/spacepackets
5
1
Fork 0
Code Issues Pull Requests Projects Releases 27 Wiki Activity

remove another error suffix
Some checks failed
Rust/spacepackets/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2023-07-09 19:31:32 +02:00
parent 4969d6c33c
commit e3d2d88538
Signed by: muellerr
GPG Key ID: A649FB78196E3849
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ecss/mod.rs
View File

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

2
src/tc.rs
View File

@ -659,7 +659,7 @@ mod tests {
assert!(res.is_err()); assert!(res.is_err());
let err = res.unwrap_err(); let err = res.unwrap_err();
match err { match err {
PusError::ByteConversionError(err) => match err { PusError::ByteConversion(err) => match err {
ByteConversionError::ToSliceTooSmall(missmatch) => { ByteConversionError::ToSliceTooSmall(missmatch) => {
assert_eq!(missmatch.expected, pus_tc.len_packed()); assert_eq!(missmatch.expected, pus_tc.len_packed());
assert_eq!(missmatch.found, 12); assert_eq!(missmatch.found, 12);

4
src/tm.rs
View File

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