Merge pull request #1488 from spevans/pr_sr_7128

millenomi · web-flow · commit 7e7fea6b7f8d · 2018-04-03T16:24:40.000-07:00
SR-7128: Remove ExpressibleByUnicodeScalarLiteral from UInt16
diff --git a/DarwinCompatibilityTests/DarwinShims.swift b/DarwinCompatibilityTests/DarwinShims.swift
@@ -19,9 +19,7 @@ import Foundation
 
 public typealias unichar = UInt16
 
-extension unichar : ExpressibleByUnicodeScalarLiteral {
-    public typealias UnicodeScalarLiteralType = UnicodeScalar
-
+extension unichar {
     public init(unicodeScalarLiteral scalar: UnicodeScalar) {
         self.init(scalar.value)
     }
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -12,9 +12,7 @@ import CoreFoundation
 
 public typealias unichar = UInt16
 
-extension unichar : ExpressibleByUnicodeScalarLiteral {
-    public typealias UnicodeScalarLiteralType = UnicodeScalar
-    
+extension unichar {
     public init(unicodeScalarLiteral scalar: UnicodeScalar) {
         self.init(scalar.value)
     }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@ import Foundation`
`19`	`19`
`20`	`20`	`public typealias unichar = UInt16`
`21`	`21`
`22`		`-extension unichar : ExpressibleByUnicodeScalarLiteral {`
`23`		`- public typealias UnicodeScalarLiteralType = UnicodeScalar`
`24`		`-`
	`22`	`+extension unichar {`
`25`	`23`	`public init(unicodeScalarLiteral scalar: UnicodeScalar) {`
`26`	`24`	`self.init(scalar.value)`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ import CoreFoundation`
`12`	`12`
`13`	`13`	`public typealias unichar = UInt16`
`14`	`14`
`15`		`-extension unichar : ExpressibleByUnicodeScalarLiteral {`
`16`		`- public typealias UnicodeScalarLiteralType = UnicodeScalar`
`17`		`-`
	`15`	`+extension unichar {`
`18`	`16`	`public init(unicodeScalarLiteral scalar: UnicodeScalar) {`
`19`	`17`	`self.init(scalar.value)`
`20`	`18`	`}`