Merge pull request #2191 from topecongiro/issue-2190

Recover from failing to format variants even where there is no comment

diff --combined src/items.rs
index c9552cb131587549103464270e5e1969f51b708a,5ad260bec7ea164e732ffff78dbc5385b6df3e70..41c1b7981adad3fb88074e8834ac98861db9d846
--- 1/src/items.rs
--- 2/src/items.rs
+++ b/src/items.rs
@@@ -366,7 -366,7 +366,7 @@@ impl<'a> FmtVisitor<'a> 
  
          let codemap = self.get_context().codemap;
  
 -        if self.config.fn_empty_single_line() && is_empty_block(block, codemap)
 +        if self.config.empty_item_single_line() && is_empty_block(block, codemap)
              && self.block_indent.width() + fn_str.len() + 2 <= self.config.max_width()
          {
              return Some(format!("{}{{}}", fn_str));
@@@ -452,9 -452,7 +452,7 @@@
          let variant_list = self.format_variant_list(enum_def, body_start, span.hi() - BytePos(1));
          match variant_list {
              Some(ref body_str) => self.buffer.push_str(body_str),
-             None => if contains_comment(&enum_snippet[brace_pos..]) {
-                 self.format_missing_no_indent(span.hi() - BytePos(1))
-             },
+             None => self.format_missing_no_indent(span.hi() - BytePos(1)),
          }
          self.block_indent = self.block_indent.block_unindent(self.config);
  
@@@ -705,7 -703,7 +703,7 @@@ fn is_impl_single_line
      let open_pos = snippet.find_uncommented("{")? + 1;
  
      Some(
 -        context.config.impl_empty_single_line() && items.is_empty() && !result.contains('\n')
 +        context.config.empty_item_single_line() && items.is_empty() && !result.contains('\n')
              && result.len() + where_clause_str.len() <= context.config.max_width()
              && !contains_comment(&snippet[open_pos..]),
      )