Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement deserialize_reader #116

Merged
merged 3 commits into from
Jan 4, 2023
Merged

implement deserialize_reader #116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e537fa
implement deserialize_reader
Arshia001 Dec 21, 2022
ab3d60e
Add tests for deserialization from std::io::Read
Arshia001 Dec 22, 2022
4ebb015
Fix lint errors
Arshia001 Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions borsh-derive-internal/src/enum_de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn enum_de(input: &ItemEnum, cratename: Ident) -> syn::Result<TokenStream2>
);

variant_header.extend(quote! {
#field_name: #cratename::BorshDeserialize::deserialize(buf)?,
#field_name: #cratename::BorshDeserialize::deserialize_reader(reader)?,
});
}
}
Expand All @@ -59,8 +59,9 @@ pub fn enum_de(input: &ItemEnum, cratename: Ident) -> syn::Result<TokenStream2>
.unwrap(),
);

variant_header
.extend(quote! { #cratename::BorshDeserialize::deserialize(buf)?, });
variant_header.extend(
quote! { #cratename::BorshDeserialize::deserialize_reader(reader)?, },
);
}
}
variant_header = quote! { ( #variant_header )};
Expand All @@ -72,12 +73,12 @@ pub fn enum_de(input: &ItemEnum, cratename: Ident) -> syn::Result<TokenStream2>
});
}
let variant_idx = quote! {
let variant_idx: u8 = #cratename::BorshDeserialize::deserialize(buf)?;
let variant_idx: u8 = #cratename::BorshDeserialize::deserialize_reader(reader)?;
};
if let Some(method_ident) = init_method {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize(buf: &mut &[u8]) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
fn deserialize_reader<R: borsh::maybestd::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
#variant_idx
let mut return_value = match variant_idx {
#variant_arms
Expand All @@ -98,7 +99,7 @@ pub fn enum_de(input: &ItemEnum, cratename: Ident) -> syn::Result<TokenStream2>
} else {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize(buf: &mut &[u8]) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
fn deserialize_reader<R: borsh::maybestd::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
#variant_idx
let return_value = match variant_idx {
#variant_arms
Expand Down
8 changes: 4 additions & 4 deletions borsh-derive-internal/src/struct_de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub fn struct_de(input: &ItemStruct, cratename: Ident) -> syn::Result<TokenStrea
);

quote! {
#field_name: #cratename::BorshDeserialize::deserialize(buf)?,
#field_name: #cratename::BorshDeserialize::deserialize_reader(reader)?,
}
};
body.extend(delta);
Expand All @@ -47,7 +47,7 @@ pub fn struct_de(input: &ItemStruct, cratename: Ident) -> syn::Result<TokenStrea
let mut body = TokenStream2::new();
for _ in 0..fields.unnamed.len() {
let delta = quote! {
#cratename::BorshDeserialize::deserialize(buf)?,
#cratename::BorshDeserialize::deserialize_reader(reader)?,
};
body.extend(delta);
}
Expand All @@ -64,7 +64,7 @@ pub fn struct_de(input: &ItemStruct, cratename: Ident) -> syn::Result<TokenStrea
if let Some(method_ident) = init_method {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize(buf: &mut &[u8]) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
fn deserialize_reader<R: borsh::maybestd::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
let mut return_value = #return_value;
return_value.#method_ident();
Ok(return_value)
Expand All @@ -74,7 +74,7 @@ pub fn struct_de(input: &ItemStruct, cratename: Ident) -> syn::Result<TokenStrea
} else {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize(buf: &mut &[u8]) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
fn deserialize_reader<R: borsh::maybestd::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::maybestd::io::Error> {
Ok(#return_value)
}
}
Expand Down