bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Format Struct { .. } on one line even with {:#?}.

Browse source
This commit is contained in:
Mara Bos 2021-04-21 13:50:56 +02:00
parent c18c0ad2bc
commit 82dc73b1ae
2 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
library/core/src/fmt/builders.rs
View file

@ -188,28 +188,19 @@ impl<'a, 'b: 'a> DebugStruct<'a, 'b> {
#[stable(feature = "debug_non_exhaustive", since = "1.53.0")]
pub fn finish_non_exhaustive(&mut self) -> fmt::Result {
self.result = self.result.and_then(|_| {
// Draw non-exhaustive dots (`..`), and open brace if necessary (no fields).
if self.has_fields {
if self.is_pretty() {
if !self.has_fields {
self.fmt.write_str(" {\n")?;
}
let mut slot = None;
let mut state = Default::default();
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut state);
writer.write_str("..\n")?;
self.fmt.write_str("}")
} else {
if self.has_fields {
self.fmt.write_str(", ..")?;
self.fmt.write_str(", .. }")
}
} else {
self.fmt.write_str(" { ..")?;
self.fmt.write_str(" { .. }")
}
}
if self.is_pretty() {
self.fmt.write_str("}")?
} else {
self.fmt.write_str(" }")?;
}
Ok(())
});
self.result
}

7
library/core/tests/fmt/builders.rs
View file

@ -105,12 +105,7 @@ mod debug_struct {
}
assert_eq!("Foo { .. }", format!("{:?}", Foo));
assert_eq!(
"Foo {
..
}",
format!("{:#?}", Foo)
);
assert_eq!("Foo { .. }", format!("{:#?}", Foo));
}
#[test]