V2: Change return type of merge functions (#867)

bufbuild · Jun 3, 2024 · 01045de · 01045de
1 parent ab40533
commit 01045de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/protobuf/src/from-binary.ts b/packages/protobuf/src/from-binary.ts
@@ -77,15 +77,14 @@ export function mergeFromBinary<Desc extends DescMessage>(
   target: MessageShape<Desc>,
   bytes: Uint8Array,
   options?: Partial<BinaryReadOptions>,
-): MessageShape<Desc> {
+): void {
   readMessage(
     reflect(messageDesc, target),
     new BinaryReader(bytes),
     makeReadOptions(options),
     false,
     bytes.byteLength,
   );
-  return target;
 }
 
 /**

diff --git a/packages/protobuf/src/from-json.ts b/packages/protobuf/src/from-json.ts
@@ -110,8 +110,8 @@ export function mergeFromJsonString<Desc extends DescMessage>(
   target: MessageShape<Desc>,
   json: string,
   options?: Partial<JsonReadOptions>,
-): MessageShape<Desc> {
-  return mergeFromJson(
+): void {
+  mergeFromJson(
     messageDesc,
     target,
     parseJsonString(json, messageDesc.typeName),
@@ -156,7 +156,7 @@ export function mergeFromJson<Desc extends DescMessage>(
   target: MessageShape<Desc>,
   json: JsonValue,
   options?: Partial<JsonReadOptions>,
-): MessageShape<Desc> {
+): void {
   try {
     readMessage(reflect(messageDesc, target), json, makeReadOptions(options));
   } catch (e) {
@@ -168,7 +168,6 @@ export function mergeFromJson<Desc extends DescMessage>(
     }
     throw e;
   }
-  return target;
 }
 
 function readMessage(