Fix variant name duplication on rewrite failure

diff --git a/src/items.rs b/src/items.rs
index ec79040f59cae02d4221baf3d29c58f14b33e5be..74a3e3a148d21be9f15deb603d40a55a252cdf6e 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -611,10 +611,7 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
 
         let result = match field.node.kind {
             ast::VariantKind::TupleVariantKind(ref types) => {
-                let name = field.node.name.to_string();
-                self.buffer.push_str(&name);
-
-                let mut result = String::new();
+                let mut result = field.node.name.to_string();
 
                 if !types.is_empty() {
                     let items = itemize_list(self.codemap,
@@ -667,11 +664,6 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
                     result.push_str(" = ");
                     let expr_snippet = self.snippet(expr.span);
                     result.push_str(&expr_snippet);
-
-                    // Make sure we do not exceed column limit
-                    assert!(self.config.max_width >=
-                            name.len() + expr_snippet.len() + " = ,".len(),
-                            "Enum variant exceeded column limit");
                 }
 
                 result

diff --git a/tests/target/enum.rs b/tests/target/enum.rs
index 2e2e47e25c2e0d3c8d270a341eac23a35ebedaba..2d87c4e862b165974b3805180e68c08019d2bd5d 100644 (file)
--- a/tests/target/enum.rs
+++ b/tests/target/enum.rs
@@ -45,3 +45,9 @@ enum StructLikeVariants {
         a: A,
     },
 }
+
+enum X {
+    CreateWebGLPaintTask(Size2D<i32>,
+                         GLContextAttributes,
+                         IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>),
+}