Merge pull request #168 from CodaFi/killvarsa

Rebind variable declarations in JSON example
typelift · Jan 29, 2015 · 78c1765 · 78c1765
2 parents 65c9c4d + c620093
commit 78c1765
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -105,16 +105,12 @@ final class User: JSONDecode {
     }
 
     public class func fromJSON(x : JSONValue) -> User? {
-        var n: String?
-        var a: Int?
-        var t: [String]?
-        var r: Dictionary<String, String>?
         switch x {
         case let .JSONObject(d):
-            n = d["name"]   >>- JString.fromJSON
-            a = d["age"]    >>- JInt.fromJSON
-            t = d["tweets"] >>- JArray<String, JString>.fromJSON
-            r = d["attrs"]  >>- JDictionary<String, JString>.fromJSON
+            let n = d["name"]   >>- JString.fromJSON
+            let a = d["age"]    >>- JInt.fromJSON
+            let t = d["tweets"] >>- JArray<String, JString>.fromJSON
+            let r = d["attrs"]  >>- JDictionary<String, JString>.fromJSON
             // alternatively, if n && a && t... { return User(n!, a!, ...
             return (User.create <^> n <*> a <*> t <*> r)
         default:

diff --git a/SwiftzTests/UserExample.swift b/SwiftzTests/UserExample.swift
@@ -30,16 +30,12 @@ public class User: JSONDecode {
 	}
 
 	public class func fromJSON(x: JSONValue) -> User? {
-		var n: String?
-		var a: Int?
-		var t: [String]?
-		var r: Dictionary<String, String>?
 		switch x {
 		case let .JSONObject(d):
-			n = d["name"]   >>- JString.fromJSON
-			a = d["age"]    >>- JInt.fromJSON
-			t = d["tweets"] >>- JArray<String, JString>.fromJSON
-			r = d["attrs"]  >>- JDictionary<String, JString>.fromJSON
+			let n = d["name"]   >>- JString.fromJSON
+			let a = d["age"]    >>- JInt.fromJSON
+			let t = d["tweets"] >>- JArray<String, JString>.fromJSON
+			let r = d["attrs"]  >>- JDictionary<String, JString>.fromJSON
 			// alternatively, if n && a && t... { return User(n!, a!, ...
 			return (User.create <^> n <*> a <*> t <*> r)
 		default: