Delegate string conversion to ICU only when encoding is EUC-JP.

In response to: #1296 (comment)

Author: YOCKOW

Sources/FoundationEssentials/String/String+IO.swift

@@ -189,6 +189,17 @@ extension String {
                 }
             }
             self = bytes.withContiguousStorageIfAvailable(buildString) ?? Array(bytes).withUnsafeBufferPointer(buildString)
+        case .japaneseEUC:
+            // Here we catch encodings that are supported by Foundation Framework
+            // but are not supported by corelibs-foundation.
+            // We delegate conversion to ICU.
+            guard let string = (
+                bytes.withContiguousStorageIfAvailable({ _icuMakeStringFromBytes($0, encoding: encoding) }) ??
+                Array(bytes).withUnsafeBufferPointer({ _icuMakeStringFromBytes($0, encoding: encoding) })
+            ) else {
+                return nil
+            }
+            self = string
         #endif
         default:
 #if FOUNDATION_FRAMEWORK
@@ -207,14 +218,8 @@ extension String {
                 return nil
             }
 #else
-            func makeString(from bytes: UnsafeBufferPointer<UInt8>) -> String? {
-                return (
-                    _cfMakeStringFromBytes(bytes, encoding: encoding.rawValue) ??
-                    _icuMakeStringFromBytes(bytes, encoding: encoding)
-                )
-            }
-            if let string = (bytes.withContiguousStorageIfAvailable({ makeString(from: $0) }) ??
-                             Array(bytes).withUnsafeBufferPointer({ makeString(from: $0) })) {
+            if let string = (bytes.withContiguousStorageIfAvailable({ _cfMakeStringFromBytes($0, encoding: encoding.rawValue) }) ??
+                             Array(bytes).withUnsafeBufferPointer({ _cfMakeStringFromBytes($0, encoding: encoding.rawValue) })) {
                 self = string
             } else {
                 return nil

Sources/FoundationEssentials/String/StringProtocol+Essentials.swift

@@ -254,18 +254,19 @@ extension String {
                     buffer.appendElement(value)
                 }
             }
+        case .japaneseEUC:
+            // Here we catch encodings that are supported by Foundation Framework
+            // but are not supported by corelibs-foundation.
+            // We delegate conversion to ICU.
+            return _icuStringEncodingConvert(string: self, using: encoding, allowLossyConversion: allowLossyConversion)
 #endif
         default:
 #if FOUNDATION_FRAMEWORK
             // Other encodings, defer to the CoreFoundation implementation
             return _ns.data(using: encoding.rawValue, allowLossyConversion: allowLossyConversion)
 #else
-            return (
-                // Attempt an up-call into swift-corelibs-foundation, which can defer to the CoreFoundation implementation
-                _cfStringEncodingConvert(string: self, using: encoding.rawValue, allowLossyConversion: allowLossyConversion) ??
-                // Or attempt an up-call into ICU via FoundationInternationalization
-                _icuStringEncodingConvert(string: self, using: encoding, allowLossyConversion: allowLossyConversion)
-            )
+            // Attempt an up-call into swift-corelibs-foundation, which can defer to the CoreFoundation implementation
+            return _cfStringEncodingConvert(string: self, using: encoding.rawValue, allowLossyConversion: allowLossyConversion)
 #endif
         }
     }