resolve merge conflict
Some checks failed
Rust/spacepackets/pipeline/head There was a failure building this commit

This commit is contained in:
Robin Müller 2023-07-10 00:38:34 +02:00
parent fd95c86294
commit e46de3421e
Signed by: muellerr
GPG Key ID: A649FB78196E3849

View File

@ -1199,7 +1199,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);