Merge pull request swiftlang#1488 from spevans/pr_sr_7128

SR-7128: Remove ExpressibleByUnicodeScalarLiteral from UInt16
aschwaighofer · Apr 3, 2018 · 7e7fea6 · 7e7fea6
2 parents 161ab81 + ad54b2a
commit 7e7fea6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
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)
     }