Merge pull request 'prep next beta release' (#28) from prep_v0.7.0-beta.1 into main

Reviewed-on: #28

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
+# [v0.7.0-beta.1] 2023-08-28
+
+- Bump `zerocopy` dependency to v0.7.0
+
 ## Changed
 
 - The `Tlv` and `Lv` API return `&[u8]` instead of `Option<&[u8]>`.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spacepackets"
-version = "0.7.0-beta.0"
+version = "0.7.0-beta.1"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
@@ -13,16 +13,19 @@ categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-sup
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zerocopy = "0.6"
 crc = "3"
 delegate = ">=0.8, <0.11"
 
+[dependencies.zerocopy]
+version = "0.7"
+features = ["derive"]
+
 [dependencies.thiserror]
 version = "1"
 optional = true
 
 [dependencies.num_enum]
-version = "0.6"
+version = ">0.5, <=0.7"
 default-features = false
 
 [dependencies.serde]

src/ecss/tc.rs

@@ -82,9 +82,9 @@ pub trait GenericPusTcSecondaryHeader {
 pub mod zc {
     use crate::ecss::tc::GenericPusTcSecondaryHeader;
     use crate::ecss::{PusError, PusVersion};
-    use zerocopy::{AsBytes, FromBytes, NetworkEndian, Unaligned, U16};
+    use zerocopy::{AsBytes, FromBytes, FromZeroes, NetworkEndian, Unaligned, U16};
 
-    #[derive(FromBytes, AsBytes, Unaligned)]
+    #[derive(FromZeroes, FromBytes, AsBytes, Unaligned)]
     #[repr(C)]
     pub struct PusTcSecondaryHeader {
         version_ack: u8,

src/ecss/tm.rs

@@ -40,9 +40,9 @@ pub trait GenericPusTmSecondaryHeader {
 pub mod zc {
     use super::GenericPusTmSecondaryHeader;
     use crate::ecss::{PusError, PusVersion};
-    use zerocopy::{AsBytes, FromBytes, NetworkEndian, Unaligned, U16};
+    use zerocopy::{AsBytes, FromBytes, FromZeroes, NetworkEndian, Unaligned, U16};
 
-    #[derive(FromBytes, AsBytes, Unaligned)]
+    #[derive(FromBytes, FromZeroes, AsBytes, Unaligned)]
     #[repr(C)]
     pub struct PusTmSecHeaderWithoutTimestamp {
         pus_version_and_sc_time_ref_status: u8,

src/lib.rs

@@ -641,9 +641,9 @@ sph_from_other!(SpHeader, crate::zc::SpHeader);
 pub mod zc {
     use crate::{CcsdsPacket, CcsdsPrimaryHeader, PacketId, PacketSequenceCtrl, VERSION_MASK};
     use zerocopy::byteorder::NetworkEndian;
-    use zerocopy::{AsBytes, FromBytes, Unaligned, U16};
+    use zerocopy::{AsBytes, FromBytes, FromZeroes, Unaligned, U16};
 
-    #[derive(FromBytes, AsBytes, Unaligned, Debug)]
+    #[derive(FromBytes, FromZeroes, AsBytes, Unaligned, Debug)]
     #[repr(C)]
     pub struct SpHeader {
         version_packet_id: U16<NetworkEndian>,