diff --git a/tls_codec/Readme.md b/tls_codec/Readme.md index b1c3db5df..28164734e 100644 --- a/tls_codec/Readme.md +++ b/tls_codec/Readme.md @@ -3,6 +3,7 @@ ![MIT licensed][license-image] [![Project Chat][chat-image]][chat-link] [![][tls_codec-ci]][tls_codec-ci-link] +![Rust Version][rustc-image] | | crates.io | docs.rs | | -------------------------------------- | ---------------------------------------------- | ------------------------------------------------------------ | @@ -49,3 +50,4 @@ serialization/deserialization [tls_codec_derive-link]: https://crates.io/crates/tls_codec_derive [tls_codec_derive_docs]: https://img.shields.io/docsrs/tls_codec_derive/latest?style=for-the-badge [tls_codec_derive_docs-link]: https://docs.rs/tls_codec_derive/ +[rustc-image]: https://img.shields.io/badge/rustc-1.51+-blue.svg?style=for-the-badge diff --git a/tls_codec/src/arrays.rs b/tls_codec/src/arrays.rs index ffb876470..a39302b1c 100644 --- a/tls_codec/src/arrays.rs +++ b/tls_codec/src/arrays.rs @@ -3,43 +3,31 @@ use super::{Deserialize, Error, Serialize, Size}; use std::io::{Read, Write}; -macro_rules! impl_array { - ($($len:literal),*) => { - $( - impl Serialize for [u8; $len] { - fn tls_serialize(&self, writer: &mut W) -> Result { - let written = writer.write(self)?; - if written == $len { - Ok(written) - } else { - Err(Error::InvalidWriteLength(format!("Expected to write {} bytes but only {} were written.", $len, written))) - } - } - } - - impl Deserialize for [u8; $len] { - fn tls_deserialize(bytes: &mut R) -> Result { - let mut out = [0u8; $len]; - bytes.read_exact(&mut out)?; - Ok(out) - } - } +impl Serialize for [u8; LEN] { + fn tls_serialize(&self, writer: &mut W) -> Result { + let written = writer.write(self)?; + if written == LEN { + Ok(written) + } else { + Err(Error::InvalidWriteLength(format!( + "Expected to write {} bytes but only {} were written.", + LEN, written + ))) + } + } +} - impl Size for [u8; $len] { - #[inline] - fn tls_serialized_len(&self) -> usize { - $len - } - } - )* - }; +impl Deserialize for [u8; LEN] { + fn tls_deserialize(bytes: &mut R) -> Result { + let mut out = [0u8; LEN]; + bytes.read_exact(&mut out)?; + Ok(out) + } } -impl_array!( - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 -); +impl Size for [u8; LEN] { + #[inline] + fn tls_serialized_len(&self) -> usize { + LEN + } +}