nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spacing in pretty printed PatKind::Struct with no fields

Browse Source
This commit is contained in:
David Tolnay 2021-12-29 12:37:13 -08:00
parent df96fb166f
commit 8d7cf1a4ca
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_ast_pretty/src/pprust/state.rs
View File

@ -2460,7 +2460,11 @@ impl<'a> State<'a> {
self.print_path(path, true, 0); self.print_path(path, true, 0);
} }
self.nbsp(); self.nbsp();
self.word_space("{"); self.word("{");
let empty = fields.is_empty() && !etc;
if !empty {
self.space();
}
self.commasep_cmnt( self.commasep_cmnt(
Consistent, Consistent,
&fields, &fields,
@ -2481,7 +2485,9 @@ impl<'a> State<'a> {
} }
self.word(".."); self.word("..");
} }
self.space(); if !empty {
self.space();
}
self.word("}"); self.word("}");
} }
PatKind::Tuple(ref elts) => { PatKind::Tuple(ref elts) => {

10
compiler/rustc_hir_pretty/src/lib.rs
View File

@ -1874,7 +1874,11 @@ impl<'a> State<'a> {
PatKind::Struct(ref qpath, ref fields, etc) => { PatKind::Struct(ref qpath, ref fields, etc) => {
self.print_qpath(qpath, true); self.print_qpath(qpath, true);
self.nbsp(); self.nbsp();
self.word_space("{"); self.word("{");
let empty = fields.is_empty() && !etc;
if !empty {
self.space();
}
self.commasep_cmnt( self.commasep_cmnt(
Consistent, Consistent,
&fields, &fields,
@ -1895,7 +1899,9 @@ impl<'a> State<'a> {
} }
self.word(".."); self.word("..");
} }
self.space(); if !empty {
self.space();
}
self.word("}"); self.word("}");
} }
PatKind::Or(ref pats) => { PatKind::Or(ref pats) => {

8
src/test/ui/macros/stringify.rs
View File

@ -661,9 +661,9 @@ fn test_pat() {
assert_eq!(stringify_pat!(ref mut _x @ _), "ref mut _x @ _"); assert_eq!(stringify_pat!(ref mut _x @ _), "ref mut _x @ _");
// PatKind::Struct // PatKind::Struct
assert_eq!(stringify_pat!(Struct {}), "Struct { }"); // FIXME assert_eq!(stringify_pat!(Struct {}), "Struct {}");
assert_eq!(stringify_pat!(Struct::<u8> {}), "Struct::<u8> { }"); assert_eq!(stringify_pat!(Struct::<u8> {}), "Struct::<u8> {}");
assert_eq!(stringify_pat!(Struct::<'static> {}), "Struct::<'static> { }"); assert_eq!(stringify_pat!(Struct::<'static> {}), "Struct::<'static> {}");
assert_eq!(stringify_pat!(Struct { x }), "Struct { x }"); assert_eq!(stringify_pat!(Struct { x }), "Struct { x }");
assert_eq!(stringify_pat!(Struct { x: _x }), "Struct { x: _x }"); assert_eq!(stringify_pat!(Struct { x: _x }), "Struct { x: _x }");
assert_eq!(stringify_pat!(Struct { .. }), "Struct { .. }"); assert_eq!(stringify_pat!(Struct { .. }), "Struct { .. }");
@ -672,7 +672,7 @@ fn test_pat() {
#[rustfmt::skip] // https://github.com/rust-lang/rustfmt/issues/5151 #[rustfmt::skip] // https://github.com/rust-lang/rustfmt/issues/5151
assert_eq!( assert_eq!(
stringify_pat!(<Struct as Trait>::Type {}), stringify_pat!(<Struct as Trait>::Type {}),
"<Struct as Trait>::Type { }", "<Struct as Trait>::Type {}",
); );
// PatKind::TupleStruct // PatKind::TupleStruct