From 0fcda9c0eb1b6ab39ed1f67067d01dbca445111e Mon Sep 17 00:00:00 2001 From: Nadav Samet Date: Sun, 7 Mar 2021 16:18:51 -0800 Subject: [PATCH] Remove erronously checked commented out code --- .../scala/scalapb/compiler/ProtobufGenerator.scala | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala index ba2a9e7d9..f03c32c26 100644 --- a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala +++ b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala @@ -726,16 +726,6 @@ class ProtobufGenerator( printer.addWithDelimiter(",")(constructorFields(message).map(_.fullString)) } - /* - def generateMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { - val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message) - printer - .add( - s"def merge(`_message__`: $myFullScalaName, `_input__`: _root_.com.google.protobuf.CodedInputStream): $myFullScalaName = ??? // newBuilder(_message__).merge(_input__).result()" - ) - } - */ - def generateToJavaProto(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { val myFullScalaName = message.scalaType.fullName printer