all: fix typos

Change-Id: I90c7beff6f065b9348d516ff2cd6d0bd0379d516

Author: NathanBaulch

cmd/protoc-gen-go/internal_gengo/well_known_types.go

@@ -1024,7 +1024,7 @@ func genMessageKnownFunctions(g *protogen.GeneratedFile, f *fileInfo, m *message
 		g.P()
 
 		g.P("// hasPathPrefix is like strings.HasPrefix, but further checks for either")
-		g.P("// an exact matche or that the prefix is delimited by a dot.")
+		g.P("// an exact match or that the prefix is delimited by a dot.")
 		g.P("func hasPathPrefix(path, prefix string) bool {")
 		g.P("	return ", stringsPackage.Ident("HasPrefix"), "(path, prefix) && (len(path) == len(prefix) || path[len(prefix)] == '.')")
 		g.P("}")

compiler/protogen/protogen_opaque.go

@@ -21,7 +21,7 @@ func opaqueNewMessageHook(message *Message) {
 	// New name mangling scheme: Add a '_' between method base
 	// name (Get, Set, Clear etc) and original field name if
 	// needed.  As a special case, there is one globally reserved
-	// name, e.g. "Build" thet still results in actual renaming of
+	// name, e.g. "Build" that still results in actual renaming of
 	// the builder field like in the old scheme.  We begin by
 	// taking care of this special case.
 	for _, field := range message.Fields {
@@ -45,7 +45,7 @@ func opaqueNewMessageHook(message *Message) {
 		camelCases[field.camelCase] = true
 
 	}
-	// For each field, check if any of it's methods would clash with an original field name
+	// For each field, check if any of its methods would clash with an original field name
 	for _, field := range message.Fields {
 		// Every field (except the union fields, that are taken care of separately) has
 		// a Get and a Set method.

encoding/protojson/encode.go

@@ -212,7 +212,7 @@ func (m unpopulatedFieldRanger) Range(f func(protoreflect.FieldDescriptor, proto
 	for i := 0; i < fds.Len(); i++ {
 		fd := fds.Get(i)
 		if m.Has(fd) || fd.ContainingOneof() != nil {
-			continue // ignore populated fields and fields within a oneofs
+			continue // ignore populated fields and fields within a oneof
 		}
 
 		v := m.Get(fd)

encoding/protojson/fuzz_test.go

@@ -64,12 +64,12 @@ func roundTripAndCompareProto(t *testing.T, wireBytes []byte, messages ...proto.
 
 		jsonBytes, err := protojson.Marshal(src)
 		if err != nil {
-			t.Errorf("failed to marshal messsage to json: %v\nmessage: %v", err, src)
+			t.Errorf("failed to marshal message to json: %v\nmessage: %v", err, src)
 		}
 		dst := msg.ProtoReflect().Type().New().Interface()
 
 		if err := protojson.Unmarshal(jsonBytes, dst); err != nil {
-			t.Errorf("failed to unmarshal messsage from json: %v\njson: %s", err, jsonBytes)
+			t.Errorf("failed to unmarshal message from json: %v\njson: %s", err, jsonBytes)
 		}
 
 		// The cmp package does not deal with NaN on its own and will report

encoding/protojson/well_known_types.go

@@ -60,7 +60,7 @@ func wellKnownTypeMarshaler(name protoreflect.FullName) marshalFunc {
 
 type unmarshalFunc func(decoder, protoreflect.Message) error
 
-// wellKnownTypeUnmarshaler returns a unmarshal function if the message type
+// wellKnownTypeUnmarshaler returns an unmarshal function if the message type
 // has specialized serialization behavior. It returns nil otherwise.
 func wellKnownTypeUnmarshaler(name protoreflect.FullName) unmarshalFunc {
 	if name.Parent() == genid.GoogleProtobuf_package {

encoding/prototext/fuzz_test.go

@@ -64,12 +64,12 @@ func roundTripAndCompareProto(t *testing.T, wireBytes []byte, messages ...proto.
 
 		textFormat, err := prototext.Marshal(src)
 		if err != nil {
-			t.Errorf("failed to marshal messsage to text format: %v\nmessage: %v", err, src)
+			t.Errorf("failed to marshal message to text format: %v\nmessage: %v", err, src)
 		}
 		dst := msg.ProtoReflect().Type().New().Interface()
 
 		if err := (prototext.Unmarshal(textFormat, dst)); err != nil {
-			t.Errorf("failed to unmarshal messsage from text format: %v\ntext format: %s", err, textFormat)
+			t.Errorf("failed to unmarshal message from text format: %v\ntext format: %s", err, textFormat)
 		}
 
 		// The cmp package does not deal with NaN on its own and will report

encoding/protowire/wire_test.go

@@ -52,7 +52,7 @@ type (
 	}
 	appendRaw []byte
 
-	// consumeOp represents an Consume operation.
+	// consumeOp represents a Consume operation.
 	consumeOp    = any
 	consumeField struct {
 		wantNum  Number

internal/cmd/generate-protos/main.go

@@ -421,7 +421,7 @@ func generateRemoteProtos() {
 
 		// Benchmark protos.
 		// TODO: The protobuf repo no longer includes benchmarks.
-		//       CL removing them says they are superceded by google/fleetbench:
+		//       CL removing them says they are superseded by google/fleetbench:
 		//         https://github.com/protocolbuffers/protobuf/commit/83c499de86224538e5d59adc3d0fa7fdb45b2c72
 		//       But that project's proto benchmark files are very different:
 		//         https://github.com/google/fleetbench/tree/main/fleetbench/proto

internal/cmd/generate-types/proto.go

@@ -104,7 +104,7 @@ func (g GoType) NullableStar() Expr {
 	return "*"
 }
 
-// OpaqueNullablePointerMethod is the "internal/impl".pointer method used to access a opaque nullable pointer to this type.
+// OpaqueNullablePointerMethod is the "internal/impl".pointer method used to access an opaque nullable pointer to this type.
 func (g GoType) OpaqueNullablePointerMethod() Expr {
 	switch g {
 	case GoString:
@@ -117,7 +117,7 @@ func (g GoType) OpaqueNullablePointerMethod() Expr {
 
 }
 
-// OpaqueNullableStar is the prefix for dereferencing a opaque nullable value of this type.
+// OpaqueNullableStar is the prefix for dereferencing an opaque nullable value of this type.
 func (g GoType) OpaqueNullableStar() Expr {
 	if g == GoString {
 		return "*" // Strings have indirection even in opaque

internal/conformance/failing_tests_text_format.txt

@@ -1,9 +1,9 @@
-Recommended.Editions_Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput                              # TEXT_FORMAT output we received from test was unparseable.
+Recommended.Editions_Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput                              # TEXT_FORMAT output we received from test was unparsable.
 Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes                      # Should have failed to parse, but didn't.
 Recommended.Editions_Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString                     # Should have failed to parse, but didn't.
 Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes                  # Should have failed to parse, but didn't.
 Recommended.Editions_Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString                 # Should have failed to parse, but didn't.
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput                                       # TEXT_FORMAT output we received from test was unparseable.
+Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput                                       # TEXT_FORMAT output we received from test was unparsable.
 Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes                               # Should have failed to parse, but didn't.
 Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString                              # Should have failed to parse, but didn't.
 Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes                           # Should have failed to parse, but didn't.