Begin filling in item spaces and breaks

Author: dtolnay

src/convenience.rs

@@ -4,6 +4,8 @@ use crate::algorithm::{self, BeginToken, BreakToken, Breaks, Printer, Token};
 use std::borrow::Cow;
 
 impl Printer {
+    pub const INDENT: usize = 4;
+
     // "raw box"
     pub fn rbox(&mut self, indent: usize, b: Breaks) {
         self.scan_begin(BeginToken {
@@ -50,6 +52,10 @@ impl Printer {
         self.spaces(1)
     }
 
+    pub fn nbsp(&mut self) {
+        self.word(" ");
+    }
+
     pub fn hardbreak(&mut self) {
         self.spaces(algorithm::SIZE_INFINITY as usize)
     }

src/data.rs

@@ -10,7 +10,9 @@ impl Printer {
         self.ident(&variant.ident);
         self.fields(&variant.fields);
         if let Some((_eq_token, discriminant)) = &variant.discriminant {
+            self.nbsp();
             self.word("=");
+            self.nbsp();
             self.expr(&discriminant);
         }
     }
@@ -24,10 +26,17 @@ impl Printer {
     }
 
     pub fn fields_named(&mut self, fields: &FieldsNamed) {
+        self.nbsp();
         self.word("{");
-        for field in &fields.named {
-            self.field(field);
-            self.word(",");
+        if !fields.named.is_empty() {
+            self.cbox(Printer::INDENT);
+            self.hardbreak();
+            for field in &fields.named {
+                self.field(field);
+                self.word(",");
+                self.hardbreak();
+            }
+            self.end();
         }
         self.word("}");
     }
@@ -47,6 +56,7 @@ impl Printer {
         if let Some(ident) = &field.ident {
             self.ident(ident);
             self.word(":");
+            self.nbsp();
         }
         self.ty(&field.ty);
     }
@@ -63,11 +73,13 @@ impl Printer {
     fn vis_public(&mut self, vis: &VisPublic) {
         let _ = vis;
         self.word("pub");
+        self.nbsp();
     }
 
     fn vis_crate(&mut self, vis: &VisCrate) {
         let _ = vis;
         self.word("crate");
+        self.nbsp();
     }
 
     fn vis_restricted(&mut self, vis: &VisRestricted) {
@@ -76,8 +88,10 @@ impl Printer {
         // automatically add the "in" token.
         if vis.in_token.is_some() {
             self.word("in");
+            self.nbsp();
         }
         self.path(&vis.path);
         self.word(")");
+        self.nbsp();
     }
 }

src/item.rs

@@ -187,6 +187,7 @@ impl Printer {
         self.outer_attrs(&item.attrs);
         self.visibility(&item.vis);
         self.word("struct");
+        self.nbsp();
         self.ident(&item.ident);
         self.generics(&item.generics);
         match &item.fields {