build(deps): update zerocopy requirement from 0.6 to 0.7 (#1939)

* build(deps): update zerocopy requirement from 0.6 to 0.7

Updates the requirements on [zerocopy](https://github.com/google/zerocopy) to permit the latest version.
- [Commits](google/zerocopy@v0.6.0...v0.7.0)

---
updated-dependencies:
- dependency-name: zerocopy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* update derive usage

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cameron Bytheway <[email protected]>

Author: dependabot[bot]

common/s2n-codec/Cargo.toml

@@ -22,5 +22,4 @@ generator = ["bolero-generator"]
 bolero-generator = { version = "0.10", default-features = false, optional = true }
 byteorder = { version = "1.1", default-features = false }
 bytes = { version = "1", default-features = false, optional = true }
-zerocopy = "0.6"
-zerocopy-derive = "0.6"
+zerocopy = { version = "0.7", features = ["derive"] }

common/s2n-codec/src/zerocopy.rs

@@ -183,6 +183,7 @@ macro_rules! zerocopy_network_integer {
             Default,
             Eq,
             $crate::zerocopy::FromBytes,
+            $crate::zerocopy::FromZeroes,
             $crate::zerocopy::AsBytes,
             $crate::zerocopy::Unaligned,
         )]
@@ -321,7 +322,9 @@ zerocopy_network_integer!(u128, U128);
 fn zerocopy_struct_test() {
     use crate::DecoderBuffer;
 
-    #[derive(Copy, Clone, Debug, PartialEq, PartialOrd, FromBytes, AsBytes, Unaligned)]
+    #[derive(
+        Copy, Clone, Debug, PartialEq, PartialOrd, FromZeroes, FromBytes, AsBytes, Unaligned,
+    )]
     #[repr(C)]
     struct UdpHeader {
         source_port: U16,

quic/s2n-quic-core/Cargo.toml

@@ -37,8 +37,7 @@ pin-project-lite = { version = "0.2" }
 s2n-codec = { version = "=0.31.0", path = "../../common/s2n-codec", default-features = false }
 subtle = { version = "2", default-features = false }
 tracing = { version = "0.1", default-features = false, optional = true }
-zerocopy = "0.6"
-zerocopy-derive = "0.6"
+zerocopy = { version = "0.7", features = ["derive"] }
 futures-test = { version = "0.3", optional = true } # For testing Waker interactions
 once_cell = { version = "1", optional = true }
 

quic/s2n-quic-core/src/crypto/tls.rs

@@ -4,7 +4,7 @@
 #[cfg(feature = "alloc")]
 pub use bytes::{Bytes, BytesMut};
 use core::{convert::TryFrom, fmt::Debug};
-use zerocopy::{AsBytes, FromBytes, Unaligned};
+use zerocopy::{AsBytes, FromBytes, FromZeroes, Unaligned};
 
 #[cfg(any(test, feature = "testing"))]
 pub mod testing;
@@ -328,7 +328,7 @@ handshake_type!(
 //#         case finished:            Finished;
 //#   } body;
 //# } Handshake;
-#[derive(Clone, Copy, Debug, AsBytes, FromBytes, Unaligned)]
+#[derive(Clone, Copy, Debug, AsBytes, FromBytes, FromZeroes, Unaligned)]
 #[repr(C)]
 pub struct HandshakeHeader {
     msg_type: u8,

quic/s2n-quic-core/src/inet/macros.rs

@@ -12,7 +12,7 @@ macro_rules! define_inet_type {
         #[cfg(any(test, feature = "generator"))]
         use bolero_generator::*;
 
-        #[derive(Clone, Copy, Default, Eq, PartialEq, PartialOrd, Ord, zerocopy::FromBytes, zerocopy::AsBytes, zerocopy::Unaligned)]
+        #[derive(Clone, Copy, Default, Eq, PartialEq, PartialOrd, Ord, zerocopy::FromZeroes, zerocopy::FromBytes, zerocopy::AsBytes, zerocopy::Unaligned)]
         #[cfg_attr(any(test, feature = "generator"), derive(bolero_generator::TypeGenerator))]
         #[cfg_attr(kani, derive(kani::Arbitrary))]
         #[repr(C)]

quic/s2n-quic/Cargo.toml

@@ -21,7 +21,6 @@ provider-address-token-default = [
     "hash_hasher",
     "s2n-quic-crypto",
     "zerocopy",
-    "zerocopy-derive",
     "zeroize",
 ]
 provider-event-console-perf = [
@@ -71,8 +70,7 @@ s2n-quic-tls = { version = "=0.31.0", path = "../s2n-quic-tls", optional = true
 s2n-quic-tls-default = { version = "=0.31.0", path = "../s2n-quic-tls-default", optional = true }
 s2n-quic-transport = { version = "=0.31.0", path = "../s2n-quic-transport" }
 tokio = { version = "1", default-features = false }
-zerocopy = { version = "0.6", optional = true }
-zerocopy-derive = { version = "0.6", optional = true }
+zerocopy = { version = "0.7", optional = true, features = ["derive"] }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]

quic/s2n-quic/src/provider/address_token/default.rs

@@ -16,7 +16,7 @@ use s2n_quic_core::{
 };
 use s2n_quic_crypto::{constant_time, digest, hmac};
 use std::hash::{Hash, Hasher};
-use zerocopy::{AsBytes, FromBytes, Unaligned};
+use zerocopy::{AsBytes, FromBytes, FromZeroes, Unaligned};
 use zeroize::Zeroizing;
 
 struct BaseKey {
@@ -355,7 +355,7 @@ impl super::Format for Format {
     }
 }
 
-#[derive(Clone, Copy, Debug, FromBytes, AsBytes, Unaligned)]
+#[derive(Clone, Copy, Debug, FromBytes, FromZeroes, AsBytes, Unaligned)]
 #[repr(C)]
 pub(crate) struct Header(u8);
 
@@ -415,7 +415,7 @@ impl Header {
 //= https://www.rfc-editor.org/rfc/rfc9000#section-8.1.4
 //#   There is no need for a single well-defined format for the token
 //#   because the server that generates the token also consumes it.
-#[derive(Copy, Clone, Debug, FromBytes, AsBytes, Unaligned)]
+#[derive(Copy, Clone, Debug, FromBytes, FromZeroes, AsBytes, Unaligned)]
 #[repr(C)]
 struct Token {
     header: Header,