From bd67abc05cfb02926406180009d1b9170401bd5c Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Mon, 11 Nov 2024 10:23:44 -0500
Subject: [PATCH] Swap String(bytes:encoding:)! for String(decoding:as:)

Avoids the force unwraps that were needed before.

From the comment in https://github.com/apple/swift-protobuf/issues/1730#issuecomment-2466138248.
---
 Sources/SwiftProtobuf/JSONEncoder.swift                | 2 +-
 Sources/SwiftProtobuf/Message+JSONAdditions.swift      | 2 +-
 Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift | 2 +-
 Sources/SwiftProtobuf/TextFormatEncoder.swift          | 2 +-
 Tests/SwiftProtobufTests/TestHelpers.swift             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftProtobuf/JSONEncoder.swift b/Sources/SwiftProtobuf/JSONEncoder.swift
index b19d270d9..d7d5ac103 100644
--- a/Sources/SwiftProtobuf/JSONEncoder.swift
+++ b/Sources/SwiftProtobuf/JSONEncoder.swift
@@ -73,7 +73,7 @@ internal struct JSONEncoder {
 
     internal var stringResult: String {
         get {
-            String(bytes: data, encoding: String.Encoding.utf8)!
+            String(decoding: data, as: UTF8.self)
         }
     }
 
diff --git a/Sources/SwiftProtobuf/Message+JSONAdditions.swift b/Sources/SwiftProtobuf/Message+JSONAdditions.swift
index 3ca6eb8b7..8ea38aa49 100644
--- a/Sources/SwiftProtobuf/Message+JSONAdditions.swift
+++ b/Sources/SwiftProtobuf/Message+JSONAdditions.swift
@@ -32,7 +32,7 @@ extension Message {
             return try m.encodedJSONString(options: options)
         }
         let data: [UInt8] = try jsonUTF8Bytes(options: options)
-        return String(bytes: data, encoding: .utf8)!
+        return String(decoding: data, as: UTF8.self)
     }
 
     /// Returns a `SwiftProtobufContiguousBytes` containing the UTF-8 JSON serialization of the message.
diff --git a/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift b/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift
index eb6947644..2bfec7a89 100644
--- a/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift
+++ b/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift
@@ -31,7 +31,7 @@ extension Message {
         options: JSONEncodingOptions = JSONEncodingOptions()
     ) throws -> String where C.Iterator.Element == Self {
         let data: [UInt8] = try jsonUTF8Bytes(from: collection, options: options)
-        return String(bytes: data, encoding: .utf8)!
+        return String(decoding: data, as: UTF8.self)
     }
 
     /// Returns a `SwiftProtobufContiguousBytes` containing the UTF-8 JSON serialization of the messages.
diff --git a/Sources/SwiftProtobuf/TextFormatEncoder.swift b/Sources/SwiftProtobuf/TextFormatEncoder.swift
index 56fe66899..4ab5052ae 100644
--- a/Sources/SwiftProtobuf/TextFormatEncoder.swift
+++ b/Sources/SwiftProtobuf/TextFormatEncoder.swift
@@ -37,7 +37,7 @@ internal struct TextFormatEncoder {
     private var indentString: [UInt8] = []
     var stringResult: String {
         get {
-            String(bytes: data, encoding: String.Encoding.utf8)!
+            String(decoding: data, as: UTF8.self)
         }
     }
 
diff --git a/Tests/SwiftProtobufTests/TestHelpers.swift b/Tests/SwiftProtobufTests/TestHelpers.swift
index 30f57aec4..4d5f04f44 100644
--- a/Tests/SwiftProtobufTests/TestHelpers.swift
+++ b/Tests/SwiftProtobufTests/TestHelpers.swift
@@ -373,7 +373,7 @@ extension PBTestHelpers where MessageTestType: SwiftProtobuf.Message & Equatable
 
             do {
                 let encoded: [UInt8] = try decoded.jsonUTF8Bytes()
-                let encodedString = String(bytes: encoded, encoding: String.Encoding.utf8)!
+                let encodedString = String(decoding: encoded, as: UTF8.self)
                 do {
                     let redecoded = try MessageTestType(
                         jsonUTF8Bytes: encoded,