From a673fef844fdd8c5d1b1924ab1e823e1e7f9a360 Mon Sep 17 00:00:00 2001
From: Marcus Klaas <mail@marcusklaas.nl>
Date: Sun, 27 Sep 2015 17:23:37 +0200
Subject: [PATCH] Fix variant name duplication on rewrite failure
---
src/items.rs | 10 +---------
tests/target/enum.rs | 6 ++++++
2 files changed, 7 insertions(+), 9 deletions(-)
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 @@ impl<'a> FmtVisitor<'a> {
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 @@ impl<'a> FmtVisitor<'a> {
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>>),
+}