Fix comments

Author: Pouya Yarandi

Sources/SwiftProtobuf/Message+FieldMask.swift

@@ -34,18 +34,19 @@ extension Message {
   }
 }
 
-/// Defines available options for merging two messages.
-public struct MergeOption {
+extension Google_Protobuf_FieldMask {
 
-  public init(replaceRepeatedFields: Bool = false) {
-    self.replaceRepeatedFields = replaceRepeatedFields
-  }
+  /// Defines available options for merging two messages.
+  public struct MergeOptions {
+
+    public init() {}
 
-  /// The default merging behavior will append entries from the source
-  /// repeated field to the destination repeated field. If you only want
-  /// to keep the entries from the source repeated field, set this flag
-  /// to true.
-  public var replaceRepeatedFields = false
+    /// The default merging behavior will append entries from the source
+    /// repeated field to the destination repeated field. If you only want
+    /// to keep the entries from the source repeated field, set this flag
+    /// to true.
+    public var replaceRepeatedFields = false
+  }
 }
 
 extension Message {
@@ -58,7 +59,7 @@ extension Message {
   public mutating func merge(
     from source: Self,
     fieldMask: Google_Protobuf_FieldMask,
-    mergeOption: MergeOption = .init()
+    mergeOption: Google_Protobuf_FieldMask.MergeOptions = .init()
   ) throws {
     var source = source
     var pathToValueMap: [String: Any?] = [:]

Sources/SwiftProtobuf/SetPathDecoder.swift

@@ -52,7 +52,7 @@ struct SetPathDecoder<T: Message>: Decoder {
   private let nextPath: [String]
 
   // Merge options to be concidered while setting value
-  private let mergeOption: MergeOption
+  private let mergeOption: Google_Protobuf_FieldMask.MergeOptions
 
   private var replaceRepeatedFields: Bool {
     mergeOption.replaceRepeatedFields
@@ -61,7 +61,7 @@ struct SetPathDecoder<T: Message>: Decoder {
   init(
     path: [String],
     value: Any?,
-    mergeOption: MergeOption
+    mergeOption: Google_Protobuf_FieldMask.MergeOptions
   ) {
     if let firstComponent = path.first,
        let number = T.number(for: firstComponent) {
@@ -385,7 +385,7 @@ extension Message {
   mutating func `set`(
     path: String,
     value: Any?,
-    mergeOption: MergeOption
+    mergeOption: Google_Protobuf_FieldMask.MergeOptions
   ) throws {
     let _path = path.components(separatedBy: ".")
     var decoder = SetPathDecoder<Self>(

Tests/SwiftProtobufTests/Test_FieldMask.swift

@@ -151,7 +151,9 @@ final class Test_FieldMask: XCTestCase, PBTestHelpers {
         XCTAssertEqual(message.repeatedInt32, [1, 2, 3, 4])
 
         // Checks with replacing repeated fields
-        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: .init(replaceRepeatedFields: true))
+        var options = Google_Protobuf_FieldMask.MergeOptions()
+        options.replaceRepeatedFields = true
+        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: options)
         XCTAssertEqual(message.repeatedInt32, [3, 4])
     }
 
@@ -172,7 +174,9 @@ final class Test_FieldMask: XCTestCase, PBTestHelpers {
         XCTAssertEqual(message.mapInt32String, [1: "a", 2: "b"])
 
         // Checks with replacing repeated fields
-        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: .init(replaceRepeatedFields: true))
+        var options = Google_Protobuf_FieldMask.MergeOptions()
+        options.replaceRepeatedFields = true
+        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: options)
         XCTAssertEqual(message.mapInt32String, [2: "b"])
     }