Rename merge(from:) to merge(with:)

Author: Pouya Yarandi

Sources/SwiftProtobuf/Message+FieldMask.swift

@@ -57,7 +57,7 @@ extension Message {
   ///   - source: Message should be merged to the original one.
   ///   - fieldMask: FieldMask specifies which fields should be merged.
   public mutating func merge(
-    from source: Self,
+    with source: Self,
     fieldMask: Google_Protobuf_FieldMask,
     mergeOption: Google_Protobuf_FieldMask.MergeOptions = .init()
   ) throws {
@@ -97,7 +97,7 @@ extension Message where Self: Equatable, Self: _ProtoNameProviding {
     }
     var tmp = Self(removingAllFieldsOf: self)
     do {
-      try tmp.merge(from: self, fieldMask: fieldMask)
+      try tmp.merge(with: self, fieldMask: fieldMask)
       let changed = tmp != self
       self = tmp
       return changed

Tests/SwiftProtobufTests/Test_FieldMask.swift

@@ -124,12 +124,12 @@ final class Test_FieldMask: XCTestCase, PBTestHelpers {
         }
 
         // Checks nested message merge
-        try message.merge(from: secondMessage, fieldMask: .init(protoPaths: "optional_nested_message.bb"))
+        try message.merge(with: secondMessage, fieldMask: .init(protoPaths: "optional_nested_message.bb"))
         XCTAssertEqual(message.optionalInt32, 1)
         XCTAssertEqual(message.optionalNestedMessage.bb, 3)
 
         // Checks primitive type merge
-        try message.merge(from: secondMessage, fieldMask: .init(protoPaths: "optional_int32"))
+        try message.merge(with: secondMessage, fieldMask: .init(protoPaths: "optional_int32"))
         XCTAssertEqual(message.optionalInt32, 2)
         XCTAssertEqual(message.optionalNestedMessage.bb, 3)
     }
@@ -147,13 +147,13 @@ final class Test_FieldMask: XCTestCase, PBTestHelpers {
         let fieldMask = Google_Protobuf_FieldMask(protoPaths: ["repeated_int32"])
 
         // Checks without replacing repeated fields
-        try message.merge(from: secondMessage, fieldMask: fieldMask)
+        try message.merge(with: secondMessage, fieldMask: fieldMask)
         XCTAssertEqual(message.repeatedInt32, [1, 2, 3, 4])
 
         // Checks with replacing repeated fields
         var options = Google_Protobuf_FieldMask.MergeOptions()
         options.replaceRepeatedFields = true
-        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: options)
+        try message.merge(with: secondMessage, fieldMask: fieldMask, mergeOption: options)
         XCTAssertEqual(message.repeatedInt32, [3, 4])
     }
 
@@ -170,13 +170,13 @@ final class Test_FieldMask: XCTestCase, PBTestHelpers {
         let fieldMask = Google_Protobuf_FieldMask(protoPaths: ["map_int32_string"])
 
         // Checks without replacing repeated fields
-        try message.merge(from: secondMessage, fieldMask: fieldMask)
+        try message.merge(with: secondMessage, fieldMask: fieldMask)
         XCTAssertEqual(message.mapInt32String, [1: "a", 2: "b"])
 
         // Checks with replacing repeated fields
         var options = Google_Protobuf_FieldMask.MergeOptions()
         options.replaceRepeatedFields = true
-        try message.merge(from: secondMessage, fieldMask: fieldMask, mergeOption: options)
+        try message.merge(with: secondMessage, fieldMask: fieldMask, mergeOption: options)
         XCTAssertEqual(message.mapInt32String, [2: "b"])
     }