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

chore: remove conflicts with W/R parameters for BorshSerialize/BorshDeserialize derives #283

Merged
merged 1 commit into from
Feb 29, 2024
Merged

chore: remove conflicts with W/R parameters for BorshSerialize/BorshDeserialize derives #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions borsh-derive/src/internals/deserialize/enums/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ pub fn process(input: &ItemEnum, cratename: Path) -> syn::Result<TokenStream2> {

Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize_reader<R: #cratename::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::io::Error> {
fn deserialize_reader<__R: #cratename::io::Read>(reader: &mut __R) -> ::core::result::Result<Self, #cratename::io::Error> {
let tag = <u8 as #cratename::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as #cratename::de::EnumExt>::deserialize_variant(reader, tag)
}
}

impl #impl_generics #cratename::de::EnumExt for #name #ty_generics #where_clause {
fn deserialize_variant<R: #cratename::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: #cratename::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, #cratename::io::Error> {
let mut return_value =
Expand Down
9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/borsh_discriminant_false.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for X {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
}
}
impl borsh::de::EnumExt for X {
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand Down Expand Up @@ -40,4 +40,3 @@ impl borsh::de::EnumExt for X {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/borsh_discriminant_true.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for X {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
}
}
impl borsh::de::EnumExt for X {
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0 {
Expand Down Expand Up @@ -40,4 +40,3 @@ impl borsh::de::EnumExt for X {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/borsh_init_func.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for A {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
}
}
impl borsh::de::EnumExt for A {
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand Down Expand Up @@ -41,4 +41,3 @@ impl borsh::de::EnumExt for A {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/borsh_skip_struct_variant_field.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for AA {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
}
}
impl borsh::de::EnumExt for AA {
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -37,4 +37,3 @@ impl borsh::de::EnumExt for AA {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/borsh_skip_tuple_variant_field.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for AAT {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
}
}
impl borsh::de::EnumExt for AAT {
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -37,4 +37,3 @@ impl borsh::de::EnumExt for AAT {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/bound_generics.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ where
V: borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -23,8 +23,8 @@ where
V: borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -50,4 +50,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/check_deserialize_with_attr.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ where
K: borsh::de::BorshDeserialize,
V: borsh::de::BorshDeserialize,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -19,8 +19,8 @@ where
K: borsh::de::BorshDeserialize,
V: borsh::de::BorshDeserialize,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -46,4 +46,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/generic_borsh_skip_struct_field.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ where
K: core::default::Default,
V: core::default::Default,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -25,8 +25,8 @@ where
K: core::default::Default,
V: core::default::Default,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -52,4 +52,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/generic_borsh_skip_tuple_field.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ where
V: borsh::de::BorshDeserialize,
U: core::default::Default,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -23,8 +23,8 @@ where
V: borsh::de::BorshDeserialize,
U: core::default::Default,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -50,4 +50,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/generic_deserialize_bound.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ where
T: PartialOrd + Hash + Eq + borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -19,8 +19,8 @@ where
T: PartialOrd + Hash + Eq + borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -46,4 +46,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/recursive_enum.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ where
K: borsh::de::BorshDeserialize,
V: borsh::de::BorshDeserialize,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -21,8 +21,8 @@ where
K: borsh::de::BorshDeserialize,
V: borsh::de::BorshDeserialize,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -48,4 +48,3 @@ where
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/simple_enum_with_custom_crate.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source: borsh-derive/src/internals/deserialize/enums/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl reexporter::borsh::de::BorshDeserialize for A {
fn deserialize_reader<R: reexporter::borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: reexporter::borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, reexporter::borsh::io::Error> {
let tag = <u8 as reexporter::borsh::de::BorshDeserialize>::deserialize_reader(
reader,
Expand All @@ -13,8 +13,8 @@ impl reexporter::borsh::de::BorshDeserialize for A {
}
}
impl reexporter::borsh::de::EnumExt for A {
fn deserialize_variant<R: reexporter::borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: reexporter::borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, reexporter::borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -40,4 +40,3 @@ impl reexporter::borsh::de::EnumExt for A {
Ok(return_value)
}
}

9 changes: 4 additions & 5 deletions borsh-derive/src/internals/deserialize/enums/snapshots/simple_generics.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ where
V: borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let tag = <u8 as borsh::de::BorshDeserialize>::deserialize_reader(reader)?;
<Self as borsh::de::EnumExt>::deserialize_variant(reader, tag)
Expand All @@ -21,8 +21,8 @@ where
V: borsh::de::BorshDeserialize,
U: borsh::de::BorshDeserialize,
{
fn deserialize_variant<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_variant<__R: borsh::io::Read>(
reader: &mut __R,
variant_tag: u8,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = if variant_tag == 0u8 {
Expand All @@ -48,4 +48,3 @@ where
Ok(return_value)
}
}

4 changes: 2 additions & 2 deletions borsh-derive/src/internals/deserialize/structs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn process(input: &ItemStruct, cratename: Path) -> syn::Result<TokenStream2>
if let Some(method_ident) = item::contains_initialize_with(&input.attrs)? {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize_reader<R: #cratename::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::io::Error> {
fn deserialize_reader<__R: #cratename::io::Read>(reader: &mut __R) -> ::core::result::Result<Self, #cratename::io::Error> {
let mut return_value = #return_value;
return_value.#method_ident();
Ok(return_value)
Expand All @@ -50,7 +50,7 @@ pub fn process(input: &ItemStruct, cratename: Path) -> syn::Result<TokenStream2>
} else {
Ok(quote! {
impl #impl_generics #cratename::de::BorshDeserialize for #name #ty_generics #where_clause {
fn deserialize_reader<R: #cratename::io::Read>(reader: &mut R) -> ::core::result::Result<Self, #cratename::io::Error> {
fn deserialize_reader<__R: #cratename::io::Read>(reader: &mut __R) -> ::core::result::Result<Self, #cratename::io::Error> {
Ok(#return_value)
}
}
Expand Down
5 changes: 2 additions & 3 deletions borsh-derive/src/internals/deserialize/structs/snapshots/borsh_init_func.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source: borsh-derive/src/internals/deserialize/structs/mod.rs
expression: pretty_print_syn_str(&actual).unwrap()
---
impl borsh::de::BorshDeserialize for A {
fn deserialize_reader<R: borsh::io::Read>(
reader: &mut R,
fn deserialize_reader<__R: borsh::io::Read>(
reader: &mut __R,
) -> ::core::result::Result<Self, borsh::io::Error> {
let mut return_value = Self {
x: borsh::BorshDeserialize::deserialize_reader(reader)?,
Expand All @@ -14,4 +14,3 @@ impl borsh::de::BorshDeserialize for A {
Ok(return_value)
}
}

Loading
Loading