From 49b50ec6823c9921232f3e07a21a95f3f56f99ce Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 28 Aug 2023 18:36:00 +0200 Subject: [PATCH 1/4] prep next beta release --- CHANGELOG.md | 2 ++ Cargo.toml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d5166e..6433218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). # [unreleased] +# [v0.7.0-beta.1] 2023-08-28 + ## Changed - The `Tlv` and `Lv` API return `&[u8]` instead of `Option<&[u8]>`. diff --git a/Cargo.toml b/Cargo.toml index ad97e6b..e58b118 100644 --- a/Cargo.toml +++ b/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 "] @@ -13,7 +13,7 @@ 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" +zerocopy = ">0.5, <=0.7" crc = "3" delegate = ">=0.8, <0.11" @@ -22,7 +22,7 @@ version = "1" optional = true [dependencies.num_enum] -version = "0.6" +version = ">0.5, <=0.7" default-features = false [dependencies.serde] -- 2.43.0 From 406d731bbe9f4c096ab3ae2c0cd9b9230ca90535 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 28 Aug 2023 18:45:24 +0200 Subject: [PATCH 2/4] fix zerocopy usage --- Cargo.toml | 5 ++++- src/ecss/tc.rs | 4 ++-- src/ecss/tm.rs | 4 ++-- src/lib.rs | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e58b118..589bdb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,10 +13,13 @@ 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.5, <=0.7" crc = "3" delegate = ">=0.8, <0.11" +[dependencies.zerocopy] +version = ">0.5, <=0.7" +features = ["derive"] + [dependencies.thiserror] version = "1" optional = true diff --git a/src/ecss/tc.rs b/src/ecss/tc.rs index 19d4e16..1a55433 100644 --- a/src/ecss/tc.rs +++ b/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, diff --git a/src/ecss/tm.rs b/src/ecss/tm.rs index aee3685..4ea54d0 100644 --- a/src/ecss/tm.rs +++ b/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, diff --git a/src/lib.rs b/src/lib.rs index e096135..df09922 100644 --- a/src/lib.rs +++ b/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, -- 2.43.0 From 2ee3eee32e8cf98a6190e55fdec489773e864e74 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 28 Aug 2023 18:47:41 +0200 Subject: [PATCH 3/4] only allow zerocopy v0.7.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 589bdb6..fd21d59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ crc = "3" delegate = ">=0.8, <0.11" [dependencies.zerocopy] -version = ">0.5, <=0.7" +version = "0.7" features = ["derive"] [dependencies.thiserror] -- 2.43.0 From 1b01c8bb0b54fd45df8ca99d2a8566f168aac356 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 28 Aug 2023 18:54:01 +0200 Subject: [PATCH 4/4] small changelog note --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6433218..0453cc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). # [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]>`. -- 2.43.0