Skip to content

Commit

Permalink
tls_codec: reformat with edition 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
baloo committed Feb 23, 2025
1 parent 2ad0fbb commit 3927f34
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 31 deletions.
2 changes: 1 addition & 1 deletion tls_codec/benches/quic_vec.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use criterion::{criterion_group, criterion_main};
use criterion::{BatchSize, Criterion};
use criterion::{criterion_group, criterion_main};

use tls_codec::*;

Expand Down
2 changes: 1 addition & 1 deletion tls_codec/benches/tls_vec.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions tls_codec/derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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| {
Expand Down
6 changes: 3 additions & 3 deletions tls_codec/derive/tests/decode.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions tls_codec/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
22 changes: 12 additions & 10 deletions tls_codec/src/primitives.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,15 @@ impl<T: Deserialize> Deserialize for Option<T> {
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<T> 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<T> with {} for option. It must be 0 for None and 1 for Some.",
some_or_none[0]
))),
}
}
}
Expand All @@ -97,14 +98,15 @@ impl<T: DeserializeBytes> DeserializeBytes for Option<T> {
fn tls_deserialize_bytes(bytes: &[u8]) -> Result<(Self, &[u8]), Error> {
let (some_or_none, remainder) = <u8>::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<T> 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<T> with {} for option. It must be 0 for None and 1 for Some.",
some_or_none
))),
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tls_codec/tests/decode.rs
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tls_codec/tests/decode_bytes.rs
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tls_codec/tests/encode.rs
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tls_codec/tests/encode_bytes.rs
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down

0 comments on commit 3927f34

Please sign in to comment.