averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Stdlib] Eliminate the _UnicodeEncoding_ protocol.

Browse Source 
This protocol was only used to fake recursive protocol conformances;
collapse it into _UnicodeEncoding.
This commit is contained in:
Doug Gregor
2017-09-11 09:56:41 -07:00
parent 41ff0585fb
commit 3b47b16a47
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stdlib/public/core/UnicodeEncoding.swift
View File

@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
public protocol _UnicodeEncoding_ {
public protocol _UnicodeEncoding {
/// The basic unit of encoding
associatedtype CodeUnit : UnsignedInteger, FixedWidthInteger
@@ -44,12 +44,12 @@ public protocol _UnicodeEncoding_ {
/// A type that can be used to parse `CodeUnits` into
/// `EncodedScalar`s.
associatedtype ForwardParser : Unicode.Parser
// where ForwardParser.Encoding == Self
where ForwardParser.Encoding == Self
/// A type that can be used to parse a reversed sequence of
/// `CodeUnits` into `EncodedScalar`s.
associatedtype ReverseParser : Unicode.Parser
// where ReverseParser.Encoding == Self
where ReverseParser.Encoding == Self
//===--------------------------------------------------------------------===//
// FIXME: this requirement shouldn't be here and is mitigated by the default
@@ -60,15 +60,10 @@ public protocol _UnicodeEncoding_ {
static func _isScalar(_ x: CodeUnit) -> Bool
}
extension _UnicodeEncoding_ {
extension _UnicodeEncoding {
// See note on declaration of requirement, above
public static func _isScalar(_ x: CodeUnit) -> Bool { return false }
}
public protocol _UnicodeEncoding : _UnicodeEncoding_
where ForwardParser.Encoding == Self, ReverseParser.Encoding == Self {}
extension _UnicodeEncoding_ {
public static func transcode<FromEncoding : Unicode.Encoding>(
_ content: FromEncoding.EncodedScalar, from _: FromEncoding.Type
) -> EncodedScalar? {