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

2021-12-29 12:37:13 -08:00
parent df96fb166f
commit 8d7cf1a4ca
3 changed files with 20 additions and 8 deletions
--- a/compiler/rustc_hir_pretty/src/lib.rs
+++ b/compiler/rustc_hir_pretty/src/lib.rs
@@ -1874,7 +1874,11 @@ impl<'a> State<'a> {
            PatKind::Struct(ref qpath, ref fields, etc) => {
                self.print_qpath(qpath, true);
                self.nbsp();
-                self.word_space("{");
+                self.word("{");
+                let empty = fields.is_empty() && !etc;
+                if !empty {
+                    self.space();
+                }
                self.commasep_cmnt(
                    Consistent,
                    &fields,
@@ -1895,7 +1899,9 @@ impl<'a> State<'a> {
                    }
                    self.word("..");
                }
-                self.space();
+                if !empty {
+                    self.space();
+                }
                self.word("}");
            }
            PatKind::Or(ref pats) => {