From: Marcus Klaas <mail@marcusklaas.nl>
Date: Sun, 27 Sep 2015 15:23:37 +0000 (+0200)
Subject: Fix variant name duplication on rewrite failure
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a673fef844fdd8c5d1b1924ab1e823e1e7f9a360;p=rust.git

Fix variant name duplication on rewrite failure
---

diff --git a/src/items.rs b/src/items.rs
index ec79040f59c..74a3e3a148d 100644
--- 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 2e2e47e25c2..2d87c4e862b 100644
--- 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>>),
+}