Skip to content

Commit 77c1297

Browse files
committed
remove remaining qualifications
1 parent dafed07 commit 77c1297

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

tls_codec/derive/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ fn impl_deserialize_bytes(parsed_ast: TlsStruct) -> TokenStream2 {
10611061
impl #impl_generics tls_codec::DeserializeBytes for #ident #ty_generics #where_clause {
10621062
fn tls_deserialize_bytes(bytes: &[u8]) -> core::result::Result<(Self, &[u8]), tls_codec::Error> {
10631063
#discriminant_constants
1064-
let (discriminant, remainder) = <#repr as tls_codec::DeserializeBytes>::tls_deserialize_bytes(bytes)?;
1064+
let (discriminant, remainder) = #repr::tls_deserialize_bytes(bytes)?;
10651065
match discriminant {
10661066
#(#arms)*
10671067
_ => {

tls_codec/derive/tests/decode.rs

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![cfg(feature = "std")]
22
use tls_codec::{
3-
Deserialize, Error, Serialize, Size, TlsSliceU16, TlsVecU16, TlsVecU32, TlsVecU8, VLBytes,
3+
Deserialize, DeserializeBytes, Error, Serialize, Size, TlsSliceU16, TlsVecU16, TlsVecU32,
4+
TlsVecU8, VLBytes,
45
};
56
use tls_codec_derive::{TlsDeserialize, TlsDeserializeBytes, TlsSerialize, TlsSize};
67

@@ -58,10 +59,7 @@ fn tuple_struct() {
5859
let serialized_t1 = t1.tls_serialize_detached().unwrap();
5960
let deserialized_t1 = TupleStruct1::tls_deserialize(&mut serialized_t1.as_slice()).unwrap();
6061
let (deserialized_bytes_t1, _remainder) =
61-
<TupleStruct1 as tls_codec::DeserializeBytes>::tls_deserialize_bytes(
62-
serialized_t1.as_slice(),
63-
)
64-
.unwrap();
62+
TupleStruct1::tls_deserialize_bytes(serialized_t1.as_slice()).unwrap();
6563
assert_eq!(t1, deserialized_t1);
6664
assert_eq!(t1, deserialized_bytes_t1);
6765
assert_eq!(
@@ -77,10 +75,7 @@ fn tuple_struct() {
7775
let serialized_t2 = t2.tls_serialize_detached().unwrap();
7876
let deserialized_t2 = TupleStruct::tls_deserialize(&mut serialized_t2.as_slice()).unwrap();
7977
let (deserialized_bytes_t2, _remainder) =
80-
<TupleStruct as tls_codec::DeserializeBytes>::tls_deserialize_bytes(
81-
serialized_t2.as_slice(),
82-
)
83-
.unwrap();
78+
TupleStruct::tls_deserialize_bytes(serialized_t2.as_slice()).unwrap();
8479
assert_eq!(t2, deserialized_t2);
8580
assert_eq!(t2, deserialized_bytes_t2);
8681
assert_eq!(
@@ -98,8 +93,7 @@ fn simple_enum() {
9893
let b = &[0u8, 5] as &[u8];
9994
let mut b_reader = b;
10095
let deserialized = ExtensionType::tls_deserialize(&mut b_reader).unwrap();
101-
let (deserialized_bytes, _remainder) =
102-
<ExtensionType as tls_codec::DeserializeBytes>::tls_deserialize_bytes(b).unwrap();
96+
let (deserialized_bytes, _remainder) = ExtensionType::tls_deserialize_bytes(b).unwrap();
10397
assert_eq!(ExtensionType::RatchetTree, deserialized);
10498
assert_eq!(ExtensionType::RatchetTree, deserialized_bytes);
10599

@@ -113,8 +107,7 @@ fn simple_enum() {
113107
for variant in variants.iter() {
114108
let deserialized = ExtensionType::tls_deserialize(&mut b_reader).unwrap();
115109
assert_eq!(variant, &deserialized);
116-
let (deserialized_bytes, remainder) =
117-
<ExtensionType as tls_codec::DeserializeBytes>::tls_deserialize_bytes(b).unwrap();
110+
let (deserialized_bytes, remainder) = ExtensionType::tls_deserialize_bytes(b).unwrap();
118111
b = remainder;
119112
assert_eq!(variant, &deserialized_bytes);
120113
}
@@ -133,11 +126,9 @@ fn deserialize_tls_vec() {
133126
assert_eq!(long_vector.len(), deserialized_long_vec.len());
134127
assert_eq!(long_vector, deserialized_long_vec);
135128
let (deserialized_long_vec_bytes, _remainder): (Vec<ExtensionStruct>, &[u8]) =
136-
<TlsVecU16<ExtensionStruct> as tls_codec::DeserializeBytes>::tls_deserialize_bytes(
137-
serialized_long_vec.as_slice(),
138-
)
139-
.map(|(v, r)| (v.into(), r))
140-
.unwrap();
129+
TlsVecU16::<ExtensionStruct>::tls_deserialize_bytes(serialized_long_vec.as_slice())
130+
.map(|(v, r)| (v.into(), r))
131+
.unwrap();
141132
assert_eq!(long_vector.len(), deserialized_long_vec_bytes.len());
142133
assert_eq!(long_vector, deserialized_long_vec_bytes);
143134
}

0 commit comments

Comments
 (0)