marshal: remove unused proto3 flags

Signed-off-by: Vicent Marti <[email protected]>
planetscale · Jan 27, 2023 · 9bfe855 · 9bfe855
1 parent 8b1a967
commit 9bfe855
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/features/marshal/marshalto.go b/features/marshal/marshalto.go
@@ -46,9 +46,8 @@ type marshal struct {
 var _ generator.FeatureGenerator = (*marshal)(nil)
 
 func (p *marshal) GenerateFile(file *protogen.File) bool {
-	proto3 := file.Desc.Syntax() == protoreflect.Proto3
 	for _, message := range file.Messages {
-		p.message(proto3, message)
+		p.message(message)
 	}
 	return p.once
 }
@@ -130,7 +129,7 @@ func (p *marshal) mapField(kvField *protogen.Field, varName string) {
 	}
 }
 
-func (p *marshal) field(proto3, oneof bool, numGen *counter, field *protogen.Field) {
+func (p *marshal) field(oneof bool, numGen *counter, field *protogen.Field) {
 	fieldname := field.GoName
 	nullable := field.Message != nil || (!oneof && field.Desc.HasPresence())
 	repeated := field.Desc.Cardinality() == protoreflect.Repeated
@@ -569,9 +568,9 @@ func (p *marshal) methodMarshal() string {
 	}
 }
 
-func (p *marshal) message(proto3 bool, message *protogen.Message) {
+func (p *marshal) message(message *protogen.Message) {
 	for _, nested := range message.Messages {
-		p.message(proto3, nested)
+		p.message(nested)
 	}
 
 	if message.Desc.IsMapEntry() {
@@ -631,7 +630,7 @@ func (p *marshal) message(proto3 bool, message *protogen.Message) {
 			field := message.Fields[i]
 			oneof := field.Oneof != nil && !field.Oneof.Desc.IsSynthetic()
 			if !oneof {
-				p.field(proto3, false, &numGen, field)
+				p.field(false, &numGen, field)
 			} else {
 				p.P(`if msg, ok := m.`, field.Oneof.GoName, `.(*`, field.GoIdent.GoName, `); ok {`)
 				marshalForwardOneOf("msg")
@@ -663,7 +662,7 @@ func (p *marshal) message(proto3 bool, message *protogen.Message) {
 			field := message.Fields[i]
 			oneof := field.Oneof != nil && !field.Oneof.Desc.IsSynthetic()
 			if !oneof {
-				p.field(proto3, false, &numGen, field)
+				p.field(false, &numGen, field)
 			}
 		}
 	}
@@ -685,7 +684,7 @@ func (p *marshal) message(proto3 bool, message *protogen.Message) {
 		p.P(``)
 		p.P(`func (m *`, ccTypeName, `) `, p.methodMarshalToSizedBuffer(), `(dAtA []byte) (int, error) {`)
 		p.P(`i := len(dAtA)`)
-		p.field(proto3, true, &numGen, field)
+		p.field(true, &numGen, field)
 		p.P(`return len(dAtA) - i, nil`)
 		p.P(`}`)
 	}

diff --git a/features/size/size.go b/features/size/size.go
@@ -34,9 +34,8 @@ func (p *size) Name() string {
 }
 
 func (p *size) GenerateFile(file *protogen.File) bool {
-	proto3 := file.Desc.Syntax() == protoreflect.Proto3
 	for _, message := range file.Messages {
-		p.message(proto3, message)
+		p.message(message)
 	}
 
 	return p.once
@@ -72,7 +71,7 @@ func (p *size) messageSize(varName, sizeName string, message *protogen.Message)
 	}
 }
 
-func (p *size) field(proto3, oneof bool, field *protogen.Field, sizeName string) {
+func (p *size) field(oneof bool, field *protogen.Field, sizeName string) {
 	fieldname := field.GoName
 	nullable := field.Message != nil || (!oneof && field.Desc.HasPresence())
 	repeated := field.Desc.Cardinality() == protoreflect.Repeated
@@ -276,9 +275,9 @@ func (p *size) field(proto3, oneof bool, field *protogen.Field, sizeName string)
 	}
 }
 
-func (p *size) message(proto3 bool, message *protogen.Message) {
+func (p *size) message(message *protogen.Message) {
 	for _, nested := range message.Messages {
-		p.message(proto3, nested)
+		p.message(nested)
 	}
 
 	if message.Desc.IsMapEntry() {
@@ -300,7 +299,7 @@ func (p *size) message(proto3 bool, message *protogen.Message) {
 	for _, field := range message.Fields {
 		oneof := field.Oneof != nil && !field.Oneof.Desc.IsSynthetic()
 		if !oneof {
-			p.field(proto3, false, field, sizeName)
+			p.field(false, field, sizeName)
 		} else {
 			fieldname := field.Oneof.GoName
 			if _, ok := oneofs[fieldname]; !ok {
@@ -327,7 +326,7 @@ func (p *size) message(proto3 bool, message *protogen.Message) {
 		p.P(`}`)
 		p.P(`var l int`)
 		p.P(`_ = l`)
-		p.field(proto3, true, field, sizeName)
+		p.field(true, field, sizeName)
 		p.P(`return n`)
 		p.P(`}`)
 	}