Merge pull request #22 from JaSpa/master

Rob Rix · Rob Rix · commit a2c22dd70673 · 2015-04-19T08:22:25.000-04:00
Mark mapping closures `@noescape`
diff --git a/Box/Box.swift b/Box/Box.swift
@@ -20,7 +20,7 @@ public final class Box<T>: BoxType, Printable {
 	public let value: T
 
 	/// Constructs a new Box by transforming `value` by `f`.
-	public func map<U>(f: T -> U) -> Box<U> {
+	public func map<U>(@noescape f: T -> U) -> Box<U> {
 		return Box<U>(f(value))
 	}
 
diff --git a/Box/BoxType.swift b/Box/BoxType.swift
@@ -41,6 +41,6 @@ public func != <B: BoxType where B.Value: Equatable> (lhs: B, rhs: B) -> Bool {
 // MARK: Map
 
 /// Maps the value of a box into a new box.
-public func map<B: BoxType, C: BoxType>(v: B, f: B.Value -> C.Value) -> C {
+public func map<B: BoxType, C: BoxType>(v: B, @noescape f: B.Value -> C.Value) -> C {
 	return C(f(v.value))
 }
diff --git a/Box/Info.plist b/Box/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Box/MutableBox.swift b/Box/MutableBox.swift
@@ -15,7 +15,7 @@ public final class MutableBox<T>: MutableBoxType, Printable {
 	public var value: T
 
 	/// Constructs a new MutableBox by transforming `value` by `f`.
-	public func map<U>(f: T -> U) -> MutableBox<U> {
+	public func map<U>(@noescape f: T -> U) -> MutableBox<U> {
 		return MutableBox<U>(f(value))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public final class Box<T>: BoxType, Printable {`
`20`	`20`	`public let value: T`
`21`	`21`
`22`	`22`	/// Constructs a new Box by transforming `value` by `f`.
`23`		`- public func map<U>(f: T -> U) -> Box<U> {`
	`23`	`+ public func map<U>(@noescape f: T -> U) -> Box<U> {`
`24`	`24`	`return Box<U>(f(value))`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public func != <B: BoxType where B.Value: Equatable> (lhs: B, rhs: B) -> Bool {`
`41`	`41`	`// MARK: Map`
`42`	`42`
`43`	`43`	`/// Maps the value of a box into a new box.`
`44`		`-public func map<B: BoxType, C: BoxType>(v: B, f: B.Value -> C.Value) -> C {`
	`44`	`+public func map<B: BoxType, C: BoxType>(v: B, @noescape f: B.Value -> C.Value) -> C {`
`45`	`45`	`return C(f(v.value))`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public final class MutableBox<T>: MutableBoxType, Printable {`
`15`	`15`	`public var value: T`
`16`	`16`
`17`	`17`	/// Constructs a new MutableBox by transforming `value` by `f`.
`18`		`- public func map<U>(f: T -> U) -> MutableBox<U> {`
	`18`	`+ public func map<U>(@noescape f: T -> U) -> MutableBox<U> {`
`19`	`19`	`return MutableBox<U>(f(value))`
`20`	`20`	`}`
`21`	`21`