Use UnicodeScalar instead of Character for joining types

A bit more efficient memory-wise (16 bytes + buffer -> 4 bytes).
Wevah · Apr 7, 2022 · 33373b4 · 33373b4
1 parent b07a8b4
commit 33373b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Sources/IDNA/UTS46+Loading.swift b/Sources/IDNA/UTS46+Loading.swift
@@ -230,7 +230,7 @@ extension UTS46 {
 
 			for scalar in str.unicodeScalars {
 				if scalar.isASCII {
-					type = JoiningType(rawValue: Character(scalar))
+					type = JoiningType(rawValue: scalar)
 				} else if let type = type {
 					if first == nil {
 						first = scalar

diff --git a/Sources/IDNA/UTS46.swift b/Sources/IDNA/UTS46.swift
@@ -88,7 +88,7 @@ class UTS46 {
 		static let sequenceTerminator: UInt8 = 0
 	}
 
-	enum JoiningType: Character {
+	enum JoiningType: UnicodeScalar {
 		case causing = "C"
 		case dual = "D"
 		case right = "R"

diff --git a/Swift/UTS46+Conversion.swift b/Swift/UTS46+Conversion.swift
@@ -83,7 +83,7 @@ extension UTS46 {
 				joiningType.count == 1 else { continue }
 
 			for codepoint in range {
-				joiningTypes[UInt32(codepoint)] = JoiningType(rawValue: joiningType.first!)!
+				joiningTypes[UInt32(codepoint)] = JoiningType(rawValue: joiningType.unicodeScalars.first!)!
 			}
 		}
 	}
@@ -113,7 +113,7 @@ extension UTS46 {
 	}
 
 	private static func joiningTypesData() -> Data {
-		var reverseMap: [Character: String] = ["C": "", "D": "", "L": "", "R": "", "T": ""]
+		var reverseMap: [UnicodeScalar: String] = ["C": "", "D": "", "L": "", "R": "", "T": ""]
 
 		for (codepoint, joiningType) in joiningTypes {
 			reverseMap[joiningType.rawValue]?.unicodeScalars.append(UnicodeScalar(codepoint)!)