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

Make derive macros use fully-qualified paths #45

Closed
wants to merge 2 commits into from
Closed

Make derive macros use fully-qualified paths #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088c9ca
fix: made macros use fully-qualified paths
arctic-hen7 Jul 18, 2022
98f92b0
refactor: removed absolute paths for `Option` etc.
arctic-hen7 Sep 4, 2022
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
62 changes: 31 additions & 31 deletions derive/src/serde_bin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use proc_macro::TokenStream;

pub fn derive_ser_bin_proxy(proxy_type: &str, type_: &str) -> TokenStream {
format!(
"impl SerBin for {} {{
fn ser_bin(&self, s: &mut Vec<u8>) {{
"impl ::nanoserde::SerBin for {} {{
fn ser_bin(&self, s: &mut ::std::vec::Vec<u8>) {{
let proxy: {} = self.into();
proxy.ser_bin(s);
}}
Expand All @@ -18,10 +18,10 @@ pub fn derive_ser_bin_proxy(proxy_type: &str, type_: &str) -> TokenStream {

pub fn derive_de_bin_proxy(proxy_type: &str, type_: &str) -> TokenStream {
format!(
"impl DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> std::result::Result<Self, nanoserde::DeBinErr> {{
let proxy: {} = DeBin::de_bin(o, d)?;
std::result::Result::Ok(Into::into(&proxy))
"impl ::nanoserde::DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> ::std::result::Result<Self, ::nanoserde::DeBinErr> {{
let proxy: {} = ::nanoserde::DeBin::de_bin(o, d)?;
::std::result::Result::Ok(::std::convert::Into::into(&proxy))
}}
}}",
type_, proxy_type
Expand All @@ -37,7 +37,7 @@ pub fn derive_ser_bin_struct(struct_: &Struct) -> TokenStream {
if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
l!(
body,
"let proxy: {} = Into::into(&self.{});",
"let proxy: {} = ::std::convert::Into::into(&self.{});",
proxy,
field.field_name.as_ref().unwrap()
);
Expand All @@ -51,8 +51,8 @@ pub fn derive_ser_bin_struct(struct_: &Struct) -> TokenStream {
}
}
format!(
"impl SerBin for {} {{
fn ser_bin(&self, s: &mut Vec<u8>) {{
"impl ::nanoserde::SerBin for {} {{
fn ser_bin(&self, s: &mut ::std::vec::Vec<u8>) {{
{}
}}
}}",
Expand All @@ -67,15 +67,15 @@ pub fn derive_ser_bin_struct_unnamed(struct_: &Struct) -> TokenStream {

for (n, field) in struct_.fields.iter().enumerate() {
if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
l!(body, "let proxy: {} = Into::into(&self.{});", proxy, n);
l!(body, "let proxy: {} = ::std::convert::Into::into(&self.{});", proxy, n);
l!(body, "proxy.ser_bin(s);");
} else {
l!(body, "self.{}.ser_bin(s);", n);
}
}
format!(
"impl SerBin for {} {{
fn ser_bin(&self, s: &mut Vec<u8>) {{
"impl ::nanoserde::SerBin for {} {{
fn ser_bin(&self, s: &mut ::std::vec::Vec<u8>) {{
{}
}}
}}",
Expand All @@ -91,22 +91,22 @@ pub fn derive_de_bin_struct(struct_: &Struct) -> TokenStream {
for field in &struct_.fields {
if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
l!(body, "{}: {{", field.field_name.as_ref().unwrap());
l!(body, "let proxy: {} = DeBin::de_bin(o, d)?;", proxy);
l!(body, "Into::into(&proxy)");
l!(body, "let proxy: {} = ::nanoserde::DeBin::de_bin(o, d)?;", proxy);
l!(body, "::std::convert::Into::into(&proxy)");
l!(body, "},")
} else {
l!(
body,
"{}: DeBin::de_bin(o, d)?,",
"{}: ::nanoserde::DeBin::de_bin(o, d)?,",
field.field_name.as_ref().unwrap()
);
}
}

format!(
"impl DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> std::result::Result<Self, nanoserde::DeBinErr> {{
std::result::Result::Ok(Self {{
"impl ::nanoserde::DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> ::std::result::Result<Self, ::nanoserde::DeBinErr> {{
::std::result::Result::Ok(Self {{
{}
}})
}}
Expand All @@ -123,18 +123,18 @@ pub fn derive_de_bin_struct_unnamed(struct_: &Struct) -> TokenStream {
for (n, field) in struct_.fields.iter().enumerate() {
if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
l!(body, "{}: {{", n);
l!(body, "let proxy: {} = DeBin::de_bin(o, d)?;", proxy);
l!(body, "Into::into(&proxy)");
l!(body, "let proxy: {} = ::nanoserde::DeBin::de_bin(o, d)?;", proxy);
l!(body, "::std::convert::Into::into(&proxy)");
l!(body, "},")
} else {
l!(body, "{}: DeBin::de_bin(o, d)?,", n);
l!(body, "{}: ::nanoserde::DeBin::de_bin(o, d)?,", n);
}
}

format!(
"impl DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> std::result::Result<Self, nanoserde::DeBinErr> {{
std::result::Result::Ok(Self {{
fn de_bin(o:&mut usize, d:&[u8]) -> ::std::result::Result<Self, ::nanoserde::DeBinErr> {{
::std::result::Result::Ok(Self {{
{}
}})
}}
Expand Down Expand Up @@ -184,8 +184,8 @@ pub fn derive_ser_bin_enum(enum_: &Enum) -> TokenStream {
}

format!(
"impl SerBin for {} {{
fn ser_bin(&self, s: &mut Vec<u8>) {{
"impl ::nanoserde::SerBin for {} {{
fn ser_bin(&self, s: &mut ::std::vec::Vec<u8>) {{
match self {{
{}
}}
Expand Down Expand Up @@ -213,7 +213,7 @@ pub fn derive_de_bin_enum(enum_: &Enum) -> TokenStream {
for field in &variant.fields {
l!(
r,
"{}: DeBin::de_bin(o, d)?,",
"{}: ::nanoserde::DeBin::de_bin(o, d)?,",
field.field_name.as_ref().unwrap()
);
}
Expand All @@ -223,19 +223,19 @@ pub fn derive_de_bin_enum(enum_: &Enum) -> TokenStream {
else if variant.named == false {
l!(r, "{} => Self::{} (", lit, variant.name);
for _ in &variant.fields {
l!(r, "DeBin::de_bin(o, d)?,");
l!(r, "::nanoserde::DeBin::de_bin(o, d)?,");
}
l!(r, "),");
}
}

format!(
"impl DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> std::result::Result<Self, nanoserde::DeBinErr> {{
let id: u16 = DeBin::de_bin(o,d)?;
"impl ::nanoserde::DeBin for {} {{
fn de_bin(o:&mut usize, d:&[u8]) -> ::std::result::Result<Self, ::nanoserde::DeBinErr> {{
let id: u16 = ::nanoserde::DeBin::de_bin(o,d)?;
Ok(match id {{
{}
_ => return std::result::Result::Err(nanoserde::DeBinErr{{o:*o, l:0, s:d.len()}})
_ => return ::std::result::Result::Err(::nanoserde::DeBinErr{{o:*o, l:0, s:d.len()}})
}})
}}
}}", enum_.name, r)
Expand Down
Loading