Merge pull request #2191 from topecongiro/issue-2190

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

diff --git a/src/items.rs b/src/items.rs
index c9552cb131587549103464270e5e1969f51b708a..41c1b7981adad3fb88074e8834ac98861db9d846 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -452,9 +452,7 @@ pub fn visit_enum(
         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);
 

diff --git a/tests/source/enum.rs b/tests/source/enum.rs
index 821bb0efd993fe3b66ebc72cfb2e252ab282f778..894eb8cbaecfe5d2d64e9040b4179d792b22fd3c 100644 (file)
--- a/tests/source/enum.rs
+++ b/tests/source/enum.rs
@@ -165,3 +165,10 @@ enum State {
     TimedOut,
     Disconnected,
 }
+
+// #2190
+#[derive(Debug, Fail)]
+enum AnError {
+    #[fail(display = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")]
+    UnexpectedSingleToken { token: syn::Token },
+}

diff --git a/tests/target/enum.rs b/tests/target/enum.rs
index f3e8f2d4d6bfa6970069f4ed4564697fbfda5bd5..b60f5bcf1d6b8211dccea6f679317889b341c485 100644 (file)
--- a/tests/target/enum.rs
+++ b/tests/target/enum.rs
@@ -215,3 +215,10 @@ enum State {
     TimedOut,
     Disconnected,
 }
+
+// #2190
+#[derive(Debug, Fail)]
+enum AnError {
+    #[fail(display = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")]
+    UnexpectedSingleToken { token: syn::Token },
+}