Merge pull request #447 from CodaFi/literally-cant-even

CodaFi · web-flow · commit 8ae84afdb813 · 2016-07-13T12:55:58.000-07:00
Rename *LiteralConvertible conformances to ExpressibleBy*Literal
diff --git a/Foundation/IndexPath.swift b/Foundation/IndexPath.swift
@@ -18,7 +18,7 @@
  
  Each index in an index path represents the index into an array of children from one node in the tree to another, deeper, node.
  */
-public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableCollection, RandomAccessCollection, Comparable, ArrayLiteralConvertible {
+public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableCollection, RandomAccessCollection, Comparable, ExpressibleByArrayLiteral {
     public typealias ReferenceType = NSIndexPath
     public typealias Element = Int
     public typealias Index = Array<Int>.Index
diff --git a/Foundation/NSDictionary.swift b/Foundation/NSDictionary.swift
@@ -679,7 +679,7 @@ extension NSMutableDictionary {
     public convenience init(sharedKeySet keyset: AnyObject) { NSUnimplemented() }
 }
 
-extension NSDictionary : DictionaryLiteralConvertible { }
+extension NSDictionary : ExpressibleByDictionaryLiteral { }
 
 extension Dictionary : Bridgeable {
     public func bridge() -> NSDictionary { return _nsObject }
diff --git a/Foundation/NSNumber.swift b/Foundation/NSNumber.swift
@@ -130,7 +130,7 @@ extension Bool : _CFBridgable {
     }
 }
 
-extension NSNumber : FloatLiteralConvertible, IntegerLiteralConvertible, BooleanLiteralConvertible {
+extension NSNumber : ExpressibleByFloatLiteral, ExpressibleByIntegerLiteral, ExpressibleByBooleanLiteral {
 
 }
 
diff --git a/Foundation/NSObject.swift b/Foundation/NSObject.swift
@@ -30,7 +30,7 @@ extension NSObjectProtocol {
     }
 }
 
-public struct NSZone : NilLiteralConvertible {
+public struct NSZone : ExpressibleByNilLiteral {
     public init() {
         
     }
diff --git a/Foundation/NSOrderedSet.swift b/Foundation/NSOrderedSet.swift
@@ -8,7 +8,7 @@
 //
 
 /****************       Immutable Ordered Set   ****************/
-public class NSOrderedSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, ArrayLiteralConvertible {
+public class NSOrderedSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, ExpressibleByArrayLiteral {
     internal var _storage: Set<NSObject>
     internal var _orderedStorage: [NSObject]
     
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -12,7 +12,7 @@ import CoreFoundation
 
 public typealias unichar = UInt16
 
-extension unichar : UnicodeScalarLiteralConvertible {
+extension unichar : ExpressibleByUnicodeScalarLiteral {
     public typealias UnicodeScalarLiteralType = UnicodeScalar
     
     public init(unicodeScalarLiteral scalar: UnicodeScalar) {
@@ -1290,7 +1290,7 @@ extension NSString {
     }
 }
 
-extension NSString : StringLiteralConvertible { }
+extension NSString : ExpressibleByStringLiteral { }
 
 public class NSMutableString : NSString {
     public func replaceCharacters(in range: NSRange, with aString: String) {

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ extension NSMutableDictionary {`
`679`	`679`	`public convenience init(sharedKeySet keyset: AnyObject) { NSUnimplemented() }`
`680`	`680`	`}`
`681`	`681`
`682`		`-extension NSDictionary : DictionaryLiteralConvertible { }`
	`682`	`+extension NSDictionary : ExpressibleByDictionaryLiteral { }`
`683`	`683`
`684`	`684`	`extension Dictionary : Bridgeable {`
`685`	`685`	`public func bridge() -> NSDictionary { return _nsObject }`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ extension Bool : _CFBridgable {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`-extension NSNumber : FloatLiteralConvertible, IntegerLiteralConvertible, BooleanLiteralConvertible {`
	`133`	`+extension NSNumber : ExpressibleByFloatLiteral, ExpressibleByIntegerLiteral, ExpressibleByBooleanLiteral {`
`134`	`134`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ extension NSObjectProtocol {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-public struct NSZone : NilLiteralConvertible {`
	`33`	`+public struct NSZone : ExpressibleByNilLiteral {`
`34`	`34`	`public init() {`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import CoreFoundation`
`12`	`12`
`13`	`13`	`public typealias unichar = UInt16`
`14`	`14`
`15`		`-extension unichar : UnicodeScalarLiteralConvertible {`
	`15`	`+extension unichar : ExpressibleByUnicodeScalarLiteral {`
`16`	`16`	`public typealias UnicodeScalarLiteralType = UnicodeScalar`
`17`	`17`
`18`	`18`	`public init(unicodeScalarLiteral scalar: UnicodeScalar) {`
`@@ -1290,7 +1290,7 @@ extension NSString {`
`1290`	`1290`	`}`
`1291`	`1291`	`}`
`1292`	`1292`
`1293`		`-extension NSString : StringLiteralConvertible { }`
	`1293`	`+extension NSString : ExpressibleByStringLiteral { }`
`1294`	`1294`
`1295`	`1295`	`public class NSMutableString : NSString {`
`1296`	`1296`	`public func replaceCharacters(in range: NSRange, with aString: String) {`