Skip to content

Remove unused indent functions in ser_json and ser_ron and remove d: usize depth parameter #163

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

Open
tadeohepperle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unused indent functions in ser_json and ser_ron and remove d: usize depth parameter #163

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
52 changes: 25 additions & 27 deletions derive/src/serde_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ use proc_macro::TokenStream;
pub fn derive_ser_json_proxy(proxy_type: &str, type_: &str, crate_name: &str) -> TokenStream {
format!(
"impl {}::SerJson for {} {{
fn ser_json(&self, d: usize, s: &mut {}::SerJsonState) {{
fn ser_json(&self, s: &mut {}::SerJsonState) {{
let proxy: {} = self.into();
proxy.ser_json(d, s);
proxy.ser_json(s);
}}
}}",
crate_name, type_, crate_name, proxy_type
Expand Down Expand Up @@ -68,22 +68,22 @@ pub fn derive_ser_json_struct(struct_: &Struct, crate_name: &str) -> TokenStream
s.conl();
}};
first_field_was_serialized = true;
s.field(d+1, \"{}\");",
s.field(\"{}\");",
json_fieldname
);
l!(
s,
"{}
if let Some(t) = &{} {{
{}
t.ser_json(d+1, s);
t.ser_json(s);
}} {}",
if null_on_none { field_header } else { "" },
proxied_field,
if null_on_none { "" } else { field_header },
if null_on_none {
"else {{
Option::<i32>::ser_json(&None, d+1, s);
Option::<i32>::ser_json(&None, s);
}}"
} else {
""
Expand All @@ -96,8 +96,8 @@ pub fn derive_ser_json_struct(struct_: &Struct, crate_name: &str) -> TokenStream
s.conl();
}};
first_field_was_serialized = true;
s.field(d+1,\"{}\");
{}.ser_json(d+1, s);",
s.field(\"{}\");
{}.ser_json(s);",
json_fieldname,
proxied_field
);
Expand All @@ -108,10 +108,10 @@ pub fn derive_ser_json_struct(struct_: &Struct, crate_name: &str) -> TokenStream
format!(
"
impl{} {}::SerJson for {}{} {{
fn ser_json(&self, d: usize, s: &mut {}::SerJsonState) {{
fn ser_json(&self, s: &mut {}::SerJsonState) {{
s.st_pre();
{}
s.st_post(d);
s.st_post();
}}
}}
",
Expand Down Expand Up @@ -334,31 +334,31 @@ pub fn derive_ser_json_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
if field.ty.base() == "Option" {
l!(
items,
"if {}.is_some(){{s.field(d+1, \"{}\");{}.ser_json(d+1, s);}}",
"if {}.is_some(){{s.field(\"{}\");{}.ser_json(s);}}",
name,
name,
proxied_field
)
} else {
l!(
items,
"s.field(d+1, \"{}\");{}.ser_json(d+1, s);",
"s.field(\"{}\");{}.ser_json(s);",
name,
proxied_field
)
}
} else if field.ty.base() == "Option" {
l!(
items,
"if {}.is_some(){{s.field(d+1, \"{}\");{}.ser_json(d+1, s);s.conl();}}",
name,
name,
proxied_field
);
items,
"if {}.is_some(){{s.field(\"{}\");{}.ser_json(s);s.conl();}}",
name,
name,
proxied_field
);
} else {
l!(
items,
"s.field(d+1, \"{}\");{}.ser_json(d+1, s);s.conl();",
"s.field(\"{}\");{}.ser_json(s);s.conl();",
name,
proxied_field
);
Expand All @@ -374,7 +374,7 @@ pub fn derive_ser_json_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
s.out.push(':');
s.st_pre();
{}
s.st_post(d);
s.st_post();
s.out.push('}}');
}}",
&field_name,
Expand All @@ -394,9 +394,9 @@ pub fn derive_ser_json_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
let field_name = format!("f{}", index);
names.push(field_name.clone());
if index != last {
l!(inner, "{}.ser_json(d, s); s.out.push(',');", field_name);
l!(inner, "{}.ser_json(s); s.out.push(',');", field_name);
} else {
l!(inner, "{}.ser_json(d, s);", field_name);
l!(inner, "{}.ser_json(s);", field_name);
}
}
if contents.len() == 1 {
Expand Down Expand Up @@ -442,7 +442,7 @@ pub fn derive_ser_json_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
format!(
"
impl{} {}::SerJson for {}{} {{
fn ser_json(&self, d: usize, s: &mut {}::SerJsonState) {{
fn ser_json(&self, s: &mut {}::SerJsonState) {{
match self {{
{}
}}
Expand Down Expand Up @@ -494,8 +494,6 @@ pub fn derive_de_json_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
ident: Category::Tuple { contents },
..
} => {


if contents.len() == 1 {
l!(
r_rest,
Expand Down Expand Up @@ -595,14 +593,14 @@ pub fn derive_ser_json_struct_unnamed(struct_: &Struct, crate_name: &str) -> Tok
// if its a newtype struct and it should be transparent - skip any curles
// and skip "container"
else if transparent && struct_.fields.len() == 1 {
l!(body, "self.{}.ser_json(d, s);", 0);
l!(body, "self.{}.ser_json(s);", 0);
}
// if more than one field - encode as array []
else {
l!(body, "s.out.push('[');");
let last = struct_.fields.len() - 1;
for (n, _) in struct_.fields.iter().enumerate() {
l!(body, "self.{}.ser_json(d, s);", n);
l!(body, "self.{}.ser_json(s);", n);
if n != last {
l!(body, "s.out.push_str(\", \");");
}
Expand All @@ -613,7 +611,7 @@ pub fn derive_ser_json_struct_unnamed(struct_: &Struct, crate_name: &str) -> Tok
format!(
"
impl{} {}::SerJson for {}{} {{
fn ser_json(&self, d: usize, s: &mut {}::SerJsonState) {{
fn ser_json(&self, s: &mut {}::SerJsonState) {{
{}
}}
}}",
Expand Down
34 changes: 17 additions & 17 deletions derive/src/serde_ron.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ use crate::shared::{self, attrs_skip};
pub fn derive_ser_ron_proxy(proxy_type: &str, type_: &str, crate_name: &str) -> TokenStream {
format!(
"impl {}::SerRon for {} {{
fn ser_ron(&self, d: usize, s: &mut {}::SerRonState) {{
fn ser_ron(&self, s: &mut {}::SerRonState) {{
let proxy: {} = self.into();
proxy.ser_ron(d, s);
proxy.ser_ron(s);
}}
}}",
crate_name, type_, crate_name, proxy_type
Expand Down Expand Up @@ -56,8 +56,8 @@ pub fn derive_ser_ron_struct(struct_: &Struct, crate_name: &str) -> TokenStream
l!(
s,
"if let Some(t) = &self.{} {{
s.field(d+1, \"{}\");
t.ser_ron(d+1, s);
s.field(\"{}\");
t.ser_ron(s);
s.conl();
}};",
struct_fieldname,
Expand All @@ -66,8 +66,8 @@ pub fn derive_ser_ron_struct(struct_: &Struct, crate_name: &str) -> TokenStream
} else {
l!(
s,
"s.field(d+1,\"{}\");
self.{}.ser_ron(d+1, s);
"s.field(\"{}\");
self.{}.ser_ron(s);
s.conl();",
ron_fieldname,
struct_fieldname
Expand All @@ -78,10 +78,10 @@ pub fn derive_ser_ron_struct(struct_: &Struct, crate_name: &str) -> TokenStream
format!(
"
impl{} {}::SerRon for {}{} {{
fn ser_ron(&self, d: usize, s: &mut {}::SerRonState) {{
fn ser_ron(&self, s: &mut {}::SerRonState) {{
s.st_pre();
{}
s.st_post(d);
s.st_post();
}}
}}
",
Expand Down Expand Up @@ -111,15 +111,15 @@ pub fn derive_ser_ron_struct_unnamed(struct_: &Struct, crate_name: &str) -> Toke
.enumerate()
.filter(|(_, f)| !attrs_skip(&f.attributes))
{
l!(body, "self.{}.ser_ron(d, s);", n);
l!(body, "self.{}.ser_ron(s);", n);
if n != last {
l!(body, "s.out.push_str(\", \");");
}
}
format!(
"
impl{} {}::SerRon for {}{} {{
fn ser_ron(&self, d: usize, s: &mut {}::SerRonState) {{
fn ser_ron(&self, s: &mut {}::SerRonState) {{
s.out.push('(');
{}
s.out.push(')');
Expand Down Expand Up @@ -356,8 +356,8 @@ pub fn derive_ser_ron_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
l!(
inner,
"if {}.is_some() {{
s.field(d+1, \"{}\");
{}.ser_ron(d+1, s);
s.field(\"{}\");
{}.ser_ron(s);
s.conl();
}}",
name.as_str(),
Expand All @@ -367,8 +367,8 @@ pub fn derive_ser_ron_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
} else {
l!(
inner,
"s.field(d+1, \"{}\");
{}.ser_ron(d+1, s);
"s.field(\"{}\");
{}.ser_ron(s);
s.conl();",
name,
name
Expand All @@ -381,7 +381,7 @@ pub fn derive_ser_ron_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
s.out.push_str(\"{}\");
s.st_pre();
{}
s.st_post(d);
s.st_post();
}}",
ident,
names.join(","),
Expand All @@ -398,7 +398,7 @@ pub fn derive_ser_ron_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
let last = contents.len() - 1;
for (index, _) in &mut contents.iter().enumerate() {
let name = format!("f{}", index);
l!(inner, "{}.ser_ron(d, s);", name);
l!(inner, "{}.ser_ron(s);", name);
if index != last {
l!(inner, "s.out.push_str(\",\");")
}
Expand Down Expand Up @@ -426,7 +426,7 @@ pub fn derive_ser_ron_enum(enum_: &Enum, crate_name: &str) -> TokenStream {
format!(
"
impl{} {}::SerRon for {}{} {{
fn ser_ron(&self, d: usize, s: &mut {}::SerRonState) {{
fn ser_ron(&self, s: &mut {}::SerRonState) {{
match self {{
{}
}}
Expand Down
Loading
Loading