Update CHANGELOG.md

scalapb · Mar 8, 2021 · 6e9eb9b · 6e9eb9b
1 parent 49a8842
commit 6e9eb9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 # Change Log
 ## [0.11.0 Unreleased]
+## [0.11.0-M6]
 - Update to Scala 3.0.0-RC1
 - Update to Scala 2.13.5
+- Remove Builder class (#1033)
 
 ## [0.11.0-M5]
 - GeneratedMessage now extends Product for better type inference (#984)

diff --git 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