Remove usage of the proto Syntax call. (#792)

* Remove usage of the proto Syntax call. * Fix `gofmt`.
openconfig · Mar 10, 2023 · dba644f · dba644f
1 parent 7dd3342
commit dba644f
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/protomap/proto.go b/protomap/proto.go
@@ -141,9 +141,7 @@ func (m unpopRange) Range(f func(protoreflect.FieldDescriptor, protoreflect.Valu
 		}
 
 		v := m.Get(fd)
-		isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()
-		isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Kind() == protoreflect.MessageKind
-		if isProto2Scalar || isSingularMessage {
+		if fd.HasPresence() {
 			v = protoreflect.Value{} // use invalid value to emit null
 		}
 		if !f(fd, v) {