Skip to content

Fix formatting of empty structs/maps/tuples/etc. when using trailing commas or indentation. #26

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
bobroberts177 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix formatting of empty structs/maps/tuples/etc. when using trailing commas or indentation. #26

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
151 changes: 76 additions & 75 deletions src/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,17 +391,19 @@ impl ser::SerializeSeq for &mut Serializer {

// Close the sequence.
fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('[') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
_ => {}
}
if let Some(ident) = self.style.indent {
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push(']');
Ok(())
Expand Down Expand Up @@ -440,17 +442,19 @@ impl ser::SerializeTuple for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('[') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push(']');
Ok(())
Expand Down Expand Up @@ -489,17 +493,19 @@ impl ser::SerializeTupleStruct for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('[') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push(']');
Ok(())
Expand Down Expand Up @@ -546,31 +552,21 @@ impl ser::SerializeTupleVariant for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('[') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
self.output.push(']');
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
_ => {}
}
_ => {}
}
if let Some(ident) = self.style.indent {
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push(']');
self.output.push('}');
Ok(())
}
Expand Down Expand Up @@ -634,17 +630,19 @@ impl ser::SerializeMap for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('{') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push('}');
Ok(())
Expand Down Expand Up @@ -686,17 +684,19 @@ impl ser::SerializeStruct for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('{') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}

self.output.push('}');
Expand Down Expand Up @@ -741,34 +741,22 @@ impl ser::SerializeStructVariant for &mut Serializer {
}

fn end(self) -> Result<()> {
match self.style.trailing_comma {
if !self.output.ends_with('{') {
match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
}
_ => {}
}
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
self.output.push('}');


match self.style.trailing_comma {
TrailingComma::ALL | TrailingComma::OBJECTS => {
self.output.push(',')
_ => {}
}
_ => {}
}
if let Some(ident) = self.style.indent {
if let Some(ident) = self.style.indent {
self.style.current_indent.truncate(self.style.current_indent.len() - ident);
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
self.output.reserve(self.style.current_indent.len() + 1);
self.output.push('\n');
self.output.push_str(self.style.current_indent.as_str());
}
}
self.output.push('}');
self.output.push('}');
Ok(())
}
}
Expand Down Expand Up @@ -807,6 +795,19 @@ mod tests {
}"#;
let style = FormatConfiguration::with_indent(4, TrailingComma::ALL);
assert_eq!(to_string_formatted(&test, style).unwrap(), expected);
let test2 = Test {
int: 1,
seq: vec![],
};
let expected = r#"{
"int": 1,
"seq": [],
}"#;
let style = FormatConfiguration::with_indent(4, TrailingComma::ALL);
assert_eq!(
to_string_formatted(&test2, style).unwrap(),
expected
);
}


Expand Down