Remove PopulatorConstructable

Author: mrabiciu

Sources/SwiftProtobuf/JSONEncodingOptions.swift

@@ -13,7 +13,7 @@
 // -----------------------------------------------------------------------------
 
 /// Options for JSONEncoding.
-public struct JSONEncodingOptions: Sendable, PopulatorConstructable {
+public struct JSONEncodingOptions: Sendable {
 
   /// Always prints int64s values as numbers.
   /// By default, they are printed as strings as per proto3 JSON mapping rules.

Sources/SwiftProtobuf/JSONEncodingVisitor.swift

@@ -42,9 +42,9 @@ internal struct JSONEncodingVisitor: Visitor {
       throw JSONEncodingError.missingFieldNames
     }
     self.options = options
-      traversalOptions = TraversalOptions.with {
-        $0.alwaysVisitPrimitiveFields = options.alwaysPrintPrimitiveFields
-      }
+    var traversalOptions = TraversalOptions()
+    traversalOptions.alwaysVisitPrimitiveFields = options.alwaysPrintPrimitiveFields
+    self.traversalOptions = traversalOptions
   }
 
   mutating func startArray() {

Sources/SwiftProtobuf/Message.swift

@@ -31,7 +31,7 @@
 ///
 /// The actual functionality is implemented either in the generated code or in
 /// default implementations of the below methods and properties.
-public protocol Message: _CommonMessageConformances, PopulatorConstructable {
+public protocol Message: _CommonMessageConformances {
   /// Creates a new message with all of its fields initialized to their default
   /// values.
   init()
@@ -150,6 +150,28 @@ extension Message {
     return header + textFormatString()
   }
   #endif
+
+  /// Creates an instance of the message type on which this method is called,
+  /// executes the given block passing the message in as its sole `inout`
+  /// argument, and then returns the message.
+  ///
+  /// This method acts essentially as a "builder" in that the initialization of
+  /// the message is captured within the block, allowing the returned value to
+  /// be set in an immutable variable. For example,
+  ///
+  ///     let msg = MyMessage.with { $0.myField = "foo" }
+  ///     msg.myOtherField = 5  // error: msg is immutable
+  ///
+  /// - Parameter populator: A block or function that populates the new message,
+  ///   which is passed into the block as an `inout` argument.
+  /// - Returns: The message after execution of the block.
+  public static func with(
+    _ populator: (inout Self) throws -> ()
+  ) rethrows -> Self {
+    var message = Self()
+    try populator(&message)
+    return message
+  }
 }
 
 /// Implementation base for all messages; not intended for client use.

Sources/SwiftProtobuf/PopulatorConstructable.swift

@@ -449,7 +449,7 @@ public protocol Visitor {
 }
 
 /// Provides options for how visitor traversal should be carried out
-public struct TraversalOptions: PopulatorConstructable {
+public struct TraversalOptions {
 
   /// Determines if non-optional fields that are equal to their default values should be visited.
   /// Defaults to `false`.

Sources/SwiftProtobuf/Visitor.swift

@@ -1062,9 +1062,8 @@ final class Test_JSONDefaultValues: XCTestCase {
         + #""FieldName18":0"#
         + "}"
 
-        let encodingOptions = JSONEncodingOptions.with {
-            $0.alwaysPrintPrimitiveFields = true
-        }
+        var encodingOptions = JSONEncodingOptions()
+        encodingOptions.alwaysPrintPrimitiveFields = true
 
         let msg = SwiftProtoTesting_Test3_TestJsonAllTypesProto3()
         XCTAssertEqual(try msg.jsonString(options: encodingOptions), expected)
@@ -1162,9 +1161,8 @@ final class Test_JSONDefaultValues: XCTestCase {
         + #""FieldName18":0"#
         + "}"
 
-        let encodingOptions = JSONEncodingOptions.with {
-            $0.alwaysPrintPrimitiveFields = true
-        }
+        var encodingOptions = JSONEncodingOptions()
+        encodingOptions.alwaysPrintPrimitiveFields = true
 
         let msg = SwiftProtoTesting_Test3_TestJsonAllTypesProto3.with {
             $0.optionalNestedMessage = .init()
@@ -1245,9 +1243,8 @@ final class Test_JSONDefaultValues: XCTestCase {
         + #""defaultCord":"123""#
         + "}"
 
-        let encodingOptions = JSONEncodingOptions.with {
-            $0.alwaysPrintPrimitiveFields = true
-        }
+        var encodingOptions = JSONEncodingOptions()
+        encodingOptions.alwaysPrintPrimitiveFields = true
         let msg = SwiftProtoTesting_TestAllTypes()
         XCTAssertEqual(try msg.jsonString(options: encodingOptions), expected)
     }
@@ -1321,9 +1318,8 @@ final class Test_JSONDefaultValues: XCTestCase {
         + #""defaultCord":"123""#
         + "}"
 
-        let encodingOptions = JSONEncodingOptions.with {
-            $0.alwaysPrintPrimitiveFields = true
-        }
+        var encodingOptions = JSONEncodingOptions()
+        encodingOptions.alwaysPrintPrimitiveFields = true
         let msg = SwiftProtoTesting_TestAllTypes.with {
             $0.optionalNestedMessage = .init()
             $0.optionalString = "i am a test string value"
@@ -1364,9 +1360,8 @@ final class Test_JSONDefaultValues: XCTestCase {
         + #""replacementString":"${unknown}""#
         + "}"
 
-        let encodingOptions = JSONEncodingOptions.with {
-            $0.alwaysPrintPrimitiveFields = true
-        }
+        var encodingOptions = JSONEncodingOptions()
+        encodingOptions.alwaysPrintPrimitiveFields = true
         let msg = SwiftProtoTesting_TestExtremeDefaultValues()
         XCTAssertEqual(try msg.jsonString(options: encodingOptions), expected)
     }