From 771236953f445bcfe225247d68506f3e80ab2e94 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sun, 26 Oct 2014 17:59:03 +0000
Subject: [PATCH] [Result] Remove labels from enum

---
 Stencil/Node.swift               | 20 ++++++++++----------
 Stencil/Result.swift             |  4 ++--
 Stencil/Template.swift           |  2 +-
 StencilTests/NodeTests.swift     |  2 +-
 StencilTests/StencilTests.swift  |  6 +++---
 StencilTests/TemplateTests.swift |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Stencil/Node.swift b/Stencil/Node.swift
index 24055b3..9f34ec2 100644
--- a/Stencil/Node.swift
+++ b/Stencil/Node.swift
@@ -45,11 +45,11 @@ public func renderNodes(nodes:[Node], context:Context) -> Result {
         case .Success(let string):
             result += string
         case .Error(let error):
-            return .Error(error:error)
+            return .Error(error)
         }
     }
 
-    return .Success(string:result)
+    return .Success(result)
 }
 
 public class TextNode : Node {
@@ -60,7 +60,7 @@ public class TextNode : Node {
     }
 
     public func render(context:Context) -> Result {
-        return .Success(string:self.text)
+        return .Success(self.text)
     }
 }
 
@@ -79,12 +79,12 @@ public class VariableNode : Node {
         let result:AnyObject? = variable.resolve(context)
 
         if let result = result as? String {
-            return .Success(string:result)
+            return .Success(result)
         } else if let result = result as? NSObject {
-            return .Success(string:result.description)
+            return .Success(result.description)
         }
 
-        return .Success(string:"")
+        return .Success("")
     }
 }
 
@@ -121,10 +121,10 @@ public class NowNode : Node {
             formatter = NSDateFormatter()
             formatter!.dateFormat = format
         } else {
-            return .Success(string:"")
+            return .Success("")
         }
 
-        return .Success(string:formatter!.stringFromDate(date))
+        return .Success(formatter!.stringFromDate(date))
     }
 }
 
@@ -193,12 +193,12 @@ public class ForNode : Node {
                     case .Success(let string):
                         output += string
                     case .Error(let error):
-                        return .Error(error:error)
+                        return .Error(error)
                 }
             }
         }
 
-        return .Success(string:output)
+        return .Success(output)
     }
 }
 
diff --git a/Stencil/Result.swift b/Stencil/Result.swift
index 915b489..c708395 100644
--- a/Stencil/Result.swift
+++ b/Stencil/Result.swift
@@ -9,8 +9,8 @@ public func ==(lhs:Error, rhs:Error) -> Bool {
 }
 
 public enum Result : Equatable {
-    case Success(string: String)
-    case Error(error: Stencil.Error)
+    case Success(String)
+    case Error(Stencil.Error)
 }
 
 public func ==(lhs:Result, rhs:Result) -> Bool {
diff --git a/Stencil/Template.swift b/Stencil/Template.swift
index 490546f..de61fdf 100644
--- a/Stencil/Template.swift
+++ b/Stencil/Template.swift
@@ -42,7 +42,7 @@ public class Template {
                 return renderNodes(nodes, context)
 
             case .Error(let error):
-                return .Error(error:error)
+                return .Error(error)
         }
     }
 
diff --git a/StencilTests/NodeTests.swift b/StencilTests/NodeTests.swift
index a112825..975a360 100644
--- a/StencilTests/NodeTests.swift
+++ b/StencilTests/NodeTests.swift
@@ -11,7 +11,7 @@ class ErrorNodeError : Error {
 class ErrorNode : Node {
     func render(context: Context) -> Result {
 
-        return .Error(error:ErrorNodeError())
+        return .Error(ErrorNodeError())
     }
 }
 
diff --git a/StencilTests/StencilTests.swift b/StencilTests/StencilTests.swift
index fa6ee94..0eb4b57 100644
--- a/StencilTests/StencilTests.swift
+++ b/StencilTests/StencilTests.swift
@@ -22,7 +22,7 @@ func assertFailure(result:TokenParser.Results, description:String) {
 
 class CustomNode : Node {
     func render(context:Context) -> Result {
-        return .Success(string:"Hello World")
+        return .Success("Hello World")
     }
 }
 
@@ -50,7 +50,7 @@ class StencilTests: XCTestCase {
             "    - Memory Management with ARC by Kyle Fuller.\n" +
             "\n"
 
-        XCTAssertEqual(result, Result.Success(string: fixture))
+        XCTAssertEqual(result, Result.Success(fixture))
     }
 
     func testCustomTag() {
@@ -62,6 +62,6 @@ class StencilTests: XCTestCase {
         }
 
         let result = template.render()
-        XCTAssertEqual(result, Result.Success(string: "Hello World"))
+        XCTAssertEqual(result, Result.Success("Hello World"))
     }
 }
diff --git a/StencilTests/TemplateTests.swift b/StencilTests/TemplateTests.swift
index 2a610b2..3ab5b85 100644
--- a/StencilTests/TemplateTests.swift
+++ b/StencilTests/TemplateTests.swift
@@ -8,7 +8,7 @@ class TemplateTests: XCTestCase {
         let context = Context(dictionary: [ "name": "Kyle" ])
         let template = Template(templateString: "Hello World")
         let result = template.render(context)
-        XCTAssertEqual(result, Result.Success(string: "Hello World"))
+        XCTAssertEqual(result, Result.Success("Hello World"))
     }
 
 }