From 3927f3460dfc235cd7a201ffd8d14f68088c5ce1 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 22 Feb 2025 23:43:57 -0800 Subject: [PATCH] tls_codec: reformat with edition 2024 --- tls_codec/benches/quic_vec.rs | 2 +- tls_codec/benches/tls_vec.rs | 2 +- tls_codec/derive/src/lib.rs | 12 ++++++------ tls_codec/derive/tests/decode.rs | 6 +++--- tls_codec/src/lib.rs | 10 +++++----- tls_codec/src/primitives.rs | 22 ++++++++++++---------- tls_codec/tests/decode.rs | 4 ++-- tls_codec/tests/decode_bytes.rs | 2 +- tls_codec/tests/encode.rs | 2 +- tls_codec/tests/encode_bytes.rs | 2 +- 10 files changed, 33 insertions(+), 31 deletions(-) diff --git a/tls_codec/benches/quic_vec.rs b/tls_codec/benches/quic_vec.rs index f73fbbfb1..18e8f4491 100644 --- a/tls_codec/benches/quic_vec.rs +++ b/tls_codec/benches/quic_vec.rs @@ -1,5 +1,5 @@ -use criterion::{criterion_group, criterion_main}; use criterion::{BatchSize, Criterion}; +use criterion::{criterion_group, criterion_main}; use tls_codec::*; diff --git a/tls_codec/benches/tls_vec.rs b/tls_codec/benches/tls_vec.rs index 5fd017a0e..dea7112c1 100644 --- a/tls_codec/benches/tls_vec.rs +++ b/tls_codec/benches/tls_vec.rs @@ -1,5 +1,5 @@ -use criterion::{criterion_group, criterion_main}; use criterion::{BatchSize, Criterion}; +use criterion::{criterion_group, criterion_main}; /// Length of the test bytes vector. const N: usize = 0xFFFF; diff --git a/tls_codec/derive/src/lib.rs b/tls_codec/derive/src/lib.rs index dd3a9c485..e824583c4 100644 --- a/tls_codec/derive/src/lib.rs +++ b/tls_codec/derive/src/lib.rs @@ -268,12 +268,12 @@ use proc_macro::TokenStream; use proc_macro2::{Span, TokenStream as TokenStream2}; use quote::quote; use syn::{ - self, parse_macro_input, punctuated::Punctuated, token::Comma, Attribute, Data, DeriveInput, - Expr, ExprLit, ExprPath, Field, Generics, Ident, Lit, Member, Meta, Result, Token, Type, + self, Attribute, Data, DeriveInput, Expr, ExprLit, ExprPath, Field, Generics, Ident, Lit, + Member, Meta, Result, Token, Type, parse_macro_input, punctuated::Punctuated, token::Comma, }; #[cfg(feature = "conditional_deserialization")] -use syn::{parse_quote, ConstParam, ImplGenerics, ItemStruct, TypeGenerics}; +use syn::{ConstParam, ImplGenerics, ItemStruct, TypeGenerics, parse_quote}; /// Attribute name to identify attributes to be processed by derive-macros in this crate. const ATTR_IDENT: &str = "tls_codec"; @@ -738,8 +738,8 @@ fn define_discriminant_constants( Span::call_site(), "The tls_codec discriminant attribute is missing. \ Once you start using paths in #[tls_codec(discriminant = \"path::to::const::or::enum::variant\"], \ - You **have** to provide the discriminant attribute on every single variant.") - ); + You **have** to provide the discriminant attribute on every single variant.", + )); } else { quote! { #[allow(non_upper_case_globals)] @@ -1335,8 +1335,8 @@ fn set_cd_fields_generic( value: proc_macro2::TokenStream, ) -> ItemStruct { use syn::{ - parse::{Parse, Parser}, AngleBracketedGenericArguments, PathArguments, + parse::{Parse, Parser}, }; item_struct.fields.iter_mut().for_each(|field| { diff --git a/tls_codec/derive/tests/decode.rs b/tls_codec/derive/tests/decode.rs index c594eae49..17536c1f9 100644 --- a/tls_codec/derive/tests/decode.rs +++ b/tls_codec/derive/tests/decode.rs @@ -1,7 +1,7 @@ #![cfg(feature = "std")] use tls_codec::{ - Deserialize, DeserializeBytes, Error, Serialize, Size, TlsSliceU16, TlsVecU16, TlsVecU32, - TlsVecU8, VLBytes, + Deserialize, DeserializeBytes, Error, Serialize, Size, TlsSliceU16, TlsVecU8, TlsVecU16, + TlsVecU32, VLBytes, }; use tls_codec_derive::{TlsDeserialize, TlsDeserializeBytes, TlsSerialize, TlsSize}; @@ -531,7 +531,7 @@ fn type_with_unknowns() { #[cfg(feature = "conditional_deserialization")] mod conditional_deserialization { use tls_codec::{Deserialize, DeserializeBytes, Serialize, Size}; - use tls_codec_derive::{conditionally_deserializable, TlsSerialize, TlsSize}; + use tls_codec_derive::{TlsSerialize, TlsSize, conditionally_deserializable}; #[test] fn conditionally_deserializable_struct() { diff --git a/tls_codec/src/lib.rs b/tls_codec/src/lib.rs index e662691d7..2a8cbb244 100644 --- a/tls_codec/src/lib.rs +++ b/tls_codec/src/lib.rs @@ -41,14 +41,14 @@ mod quic_vec; mod tls_vec; pub use tls_vec::{ - SecretTlsVecU16, SecretTlsVecU24, SecretTlsVecU32, SecretTlsVecU8, TlsByteSliceU16, - TlsByteSliceU24, TlsByteSliceU32, TlsByteSliceU8, TlsByteVecU16, TlsByteVecU24, TlsByteVecU32, - TlsByteVecU8, TlsSliceU16, TlsSliceU24, TlsSliceU32, TlsSliceU8, TlsVecU16, TlsVecU24, - TlsVecU32, TlsVecU8, + SecretTlsVecU8, SecretTlsVecU16, SecretTlsVecU24, SecretTlsVecU32, TlsByteSliceU8, + TlsByteSliceU16, TlsByteSliceU24, TlsByteSliceU32, TlsByteVecU8, TlsByteVecU16, TlsByteVecU24, + TlsByteVecU32, TlsSliceU8, TlsSliceU16, TlsSliceU24, TlsSliceU32, TlsVecU8, TlsVecU16, + TlsVecU24, TlsVecU32, }; #[cfg(feature = "std")] -pub use quic_vec::{rw as vlen, SecretVLBytes}; +pub use quic_vec::{SecretVLBytes, rw as vlen}; pub use quic_vec::{VLByteSlice, VLBytes}; #[cfg(feature = "derive")] diff --git a/tls_codec/src/primitives.rs b/tls_codec/src/primitives.rs index 63e21d931..5a0c3dc00 100644 --- a/tls_codec/src/primitives.rs +++ b/tls_codec/src/primitives.rs @@ -80,14 +80,15 @@ impl Deserialize for Option { let mut some_or_none = [0u8; 1]; bytes.read_exact(&mut some_or_none)?; match some_or_none[0] { - 0 => { - Ok(None) - }, + 0 => Ok(None), 1 => { let element = T::tls_deserialize(bytes)?; Ok(Some(element)) - }, - _ => Err(Error::DecodingError(format!("Trying to decode Option with {} for option. It must be 0 for None and 1 for Some.", some_or_none[0]))) + } + _ => Err(Error::DecodingError(format!( + "Trying to decode Option with {} for option. It must be 0 for None and 1 for Some.", + some_or_none[0] + ))), } } } @@ -97,14 +98,15 @@ impl DeserializeBytes for Option { fn tls_deserialize_bytes(bytes: &[u8]) -> Result<(Self, &[u8]), Error> { let (some_or_none, remainder) = ::tls_deserialize_bytes(bytes)?; match some_or_none { - 0 => { - Ok((None, remainder)) - }, + 0 => Ok((None, remainder)), 1 => { let (element, remainder) = T::tls_deserialize_bytes(remainder)?; Ok((Some(element), remainder)) - }, - _ => Err(Error::DecodingError(alloc::format!("Trying to decode Option with {} for option. It must be 0 for None and 1 for Some.", some_or_none))) + } + _ => Err(Error::DecodingError(alloc::format!( + "Trying to decode Option with {} for option. It must be 0 for None and 1 for Some.", + some_or_none + ))), } } } diff --git a/tls_codec/tests/decode.rs b/tls_codec/tests/decode.rs index aa7ba6dbb..8beac3874 100644 --- a/tls_codec/tests/decode.rs +++ b/tls_codec/tests/decode.rs @@ -1,8 +1,8 @@ #![cfg(feature = "std")] use tls_codec::{ - Error, Serialize, Size, TlsByteSliceU16, TlsByteVecU16, TlsByteVecU8, TlsSliceU16, TlsVecU16, - TlsVecU32, TlsVecU8, VLByteSlice, VLBytes, U24, + Error, Serialize, Size, TlsByteSliceU16, TlsByteVecU8, TlsByteVecU16, TlsSliceU16, TlsVecU8, + TlsVecU16, TlsVecU32, U24, VLByteSlice, VLBytes, }; #[test] diff --git a/tls_codec/tests/decode_bytes.rs b/tls_codec/tests/decode_bytes.rs index 67b104805..413ed4ee9 100644 --- a/tls_codec/tests/decode_bytes.rs +++ b/tls_codec/tests/decode_bytes.rs @@ -1,4 +1,4 @@ -use tls_codec::{DeserializeBytes, TlsByteVecU16, TlsByteVecU24, TlsByteVecU32, TlsByteVecU8}; +use tls_codec::{DeserializeBytes, TlsByteVecU8, TlsByteVecU16, TlsByteVecU24, TlsByteVecU32}; #[test] fn deserialize_tls_byte_vec_u8() { diff --git a/tls_codec/tests/encode.rs b/tls_codec/tests/encode.rs index 1c232a2f2..1d04de751 100644 --- a/tls_codec/tests/encode.rs +++ b/tls_codec/tests/encode.rs @@ -1,6 +1,6 @@ #![cfg(feature = "std")] -use tls_codec::{Serialize, TlsVecU16, TlsVecU24, VLByteSlice, VLBytes, U24}; +use tls_codec::{Serialize, TlsVecU16, TlsVecU24, U24, VLByteSlice, VLBytes}; #[test] fn serialize_primitives() { diff --git a/tls_codec/tests/encode_bytes.rs b/tls_codec/tests/encode_bytes.rs index febc9b15e..50e3a33b6 100644 --- a/tls_codec/tests/encode_bytes.rs +++ b/tls_codec/tests/encode_bytes.rs @@ -1,4 +1,4 @@ -use tls_codec::{SerializeBytes, TlsByteVecU16, TlsByteVecU24, TlsByteVecU32, TlsByteVecU8, U24}; +use tls_codec::{SerializeBytes, TlsByteVecU8, TlsByteVecU16, TlsByteVecU24, TlsByteVecU32, U24}; #[test] fn serialize_primitives() {