Skip to content

Commit 0fcda9c

Browse files
committed
Remove erronously checked commented out code
1 parent 77077d2 commit 0fcda9c

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -726,16 +726,6 @@ class ProtobufGenerator(
726726
printer.addWithDelimiter(",")(constructorFields(message).map(_.fullString))
727727
}
728728

729-
/*
730-
def generateMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
731-
val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message)
732-
printer
733-
.add(
734-
s"def merge(`_message__`: $myFullScalaName, `_input__`: _root_.com.google.protobuf.CodedInputStream): $myFullScalaName = ??? // newBuilder(_message__).merge(_input__).result()"
735-
)
736-
}
737-
*/
738-
739729
def generateToJavaProto(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
740730
val myFullScalaName = message.scalaType.fullName
741731
printer

0 commit comments

Comments
 (0)