From 534ecf7675222f39d98928c7e1489b56b004b774 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 26 Jul 2020 22:16:17 +0100 Subject: [PATCH] s/parsable/parseable/ --- conformance/binary_json_conformance_suite.cc | 6 +++--- conformance/text_format_conformance_suite.cc | 6 +++--- csharp/src/Google.Protobuf/JsonFormatter.cs | 2 +- python/google/protobuf/internal/reflection_test.py | 4 ++-- src/google/protobuf/compiler/parser_unittest.cc | 2 +- src/google/protobuf/compiler/plugin.cc | 2 +- src/google/protobuf/compiler/plugin.proto | 2 +- src/google/protobuf/compiler/subprocess.cc | 4 ++-- src/google/protobuf/descriptor.h | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc index ded3939122..f62c705f62 100644 --- a/conformance/binary_json_conformance_suite.cc +++ b/conformance/binary_json_conformance_suite.cc @@ -364,7 +364,7 @@ bool BinaryAndJsonConformanceSuite::ParseJsonResponse( if (!test_message->ParseFromString(binary_protobuf)) { GOOGLE_LOG(FATAL) << "INTERNAL ERROR: internal JSON->protobuf transcode " - << "yielded unparsable proto."; + << "yielded unparseable proto."; return false; } @@ -393,7 +393,7 @@ bool BinaryAndJsonConformanceSuite::ParseResponse( if (!test_message->ParseFromString(response.protobuf_payload())) { ReportFailure(test_name, level, request, response, - "Protobuf output we received from test was unparsable."); + "Protobuf output we received from test was unparseable."); return false; } @@ -412,7 +412,7 @@ bool BinaryAndJsonConformanceSuite::ParseResponse( if (!ParseJsonResponse(response, test_message)) { ReportFailure(test_name, level, request, response, - "JSON output we received from test was unparsable."); + "JSON output we received from test was unparseable."); return false; } diff --git a/conformance/text_format_conformance_suite.cc b/conformance/text_format_conformance_suite.cc index 658aaf5749..6574b10c50 100644 --- a/conformance/text_format_conformance_suite.cc +++ b/conformance/text_format_conformance_suite.cc @@ -65,7 +65,7 @@ bool TextFormatConformanceTestSuite::ParseTextFormatResponse( } if (!parser.ParseFromString(response.text_payload(), test_message)) { GOOGLE_LOG(ERROR) << "INTERNAL ERROR: internal text->protobuf transcode " - << "yielded unparsable proto. Text payload: " + << "yielded unparseable proto. Text payload: " << response.text_payload(); return false; } @@ -94,7 +94,7 @@ bool TextFormatConformanceTestSuite::ParseResponse( if (!test_message->ParseFromString(response.protobuf_payload())) { ReportFailure(test_name, level, request, response, - "Protobuf output we received from test was unparsable."); + "Protobuf output we received from test was unparseable."); return false; } @@ -114,7 +114,7 @@ bool TextFormatConformanceTestSuite::ParseResponse( if (!ParseTextFormatResponse(response, setting, test_message)) { ReportFailure( test_name, level, request, response, - "TEXT_FORMAT output we received from test was unparsable."); + "TEXT_FORMAT output we received from test was unparseable."); return false; } diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs index 4bffd58c1f..26fabde1cf 100644 --- a/csharp/src/Google.Protobuf/JsonFormatter.cs +++ b/csharp/src/Google.Protobuf/JsonFormatter.cs @@ -181,7 +181,7 @@ namespace Google.Protobuf /// is included with the base64 data from the property of the message. /// /// The value returned by this method is only designed to be used for diagnostic - /// purposes. It may not be parsable by , and may not be parsable + /// purposes. It may not be parseable by , and may not be parseable /// by other Protocol Buffer implementations. /// /// The message to format for diagnostic purposes. diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index e052776d63..f6d71b2404 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -2791,7 +2791,7 @@ class SerializationTest(unittest.TestCase): serialized = proto.SerializeToString() - # The empty message should be parsable with all of the fields + # The empty message should be parseable with all of the fields # unknown. proto2 = unittest_pb2.TestEmptyMessage() @@ -2804,7 +2804,7 @@ class SerializationTest(unittest.TestCase): proto = unittest_pb2.TestAllTypes() proto.optional_int64 = 0x0fffffffffffffff serialized = proto.SerializeToString() - # The empty message should be parsable with all of the fields + # The empty message should be parseable with all of the fields # unknown. proto2 = unittest_pb2.TestEmptyMessage() # Parsing this message should succeed. diff --git a/src/google/protobuf/compiler/parser_unittest.cc b/src/google/protobuf/compiler/parser_unittest.cc index 4a3a228e89..dd945be089 100644 --- a/src/google/protobuf/compiler/parser_unittest.cc +++ b/src/google/protobuf/compiler/parser_unittest.cc @@ -2432,7 +2432,7 @@ TEST_F(ParseDescriptorDebugTest, TestMaps) { EXPECT_TRUE(debug_string.find("option map_entry") == std::string::npos); EXPECT_TRUE(debug_string.find("MapEntry") == std::string::npos); - // Make sure the descriptor debug string is parsable. + // Make sure the descriptor debug string is parseable. FileDescriptorProto parsed; SetupParser(debug_string.c_str()); parsed.set_name("foo.proto"); diff --git a/src/google/protobuf/compiler/plugin.cc b/src/google/protobuf/compiler/plugin.cc index 5fbc0ed4c2..7306cf4449 100644 --- a/src/google/protobuf/compiler/plugin.cc +++ b/src/google/protobuf/compiler/plugin.cc @@ -160,7 +160,7 @@ int PluginMain(int argc, char* argv[], const CodeGenerator* generator) { CodeGeneratorRequest request; if (!request.ParseFromFileDescriptor(STDIN_FILENO)) { - std::cerr << argv[0] << ": protoc sent unparsable request to plugin." + std::cerr << argv[0] << ": protoc sent unparseable request to plugin." << std::endl; return 1; } diff --git a/src/google/protobuf/compiler/plugin.proto b/src/google/protobuf/compiler/plugin.proto index 4f551a5dc5..492b896c5b 100644 --- a/src/google/protobuf/compiler/plugin.proto +++ b/src/google/protobuf/compiler/plugin.proto @@ -103,7 +103,7 @@ message CodeGeneratorResponse { // This should be used to indicate errors in .proto files which prevent the // code generator from generating correct code. Errors which indicate a // problem in protoc itself -- such as the input CodeGeneratorRequest being - // unparsable -- should be reported by writing a message to stderr and + // unparseable -- should be reported by writing a message to stderr and // exiting with a non-zero status code. optional string error = 1; diff --git a/src/google/protobuf/compiler/subprocess.cc b/src/google/protobuf/compiler/subprocess.cc index aba538204f..7e59cd7d8d 100644 --- a/src/google/protobuf/compiler/subprocess.cc +++ b/src/google/protobuf/compiler/subprocess.cc @@ -260,7 +260,7 @@ bool Subprocess::Communicate(const Message& input, Message* output, } if (!output->ParseFromString(output_data)) { - *error = "Plugin output is unparsable: " + CEscape(output_data); + *error = "Plugin output is unparseable: " + CEscape(output_data); return false; } @@ -461,7 +461,7 @@ bool Subprocess::Communicate(const Message& input, Message* output, } if (!output->ParseFromString(output_data)) { - *error = "Plugin output is unparsable: " + CEscape(output_data); + *error = "Plugin output is unparseable: " + CEscape(output_data); return false; } diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h index 078f24a68b..7d543ebab0 100644 --- a/src/google/protobuf/descriptor.h +++ b/src/google/protobuf/descriptor.h @@ -157,7 +157,7 @@ struct SourceLocation { std::vector leading_detached_comments; }; -// Options when generating machine-parsable output from a descriptor with +// Options when generating machine-parseable output from a descriptor with // DebugString(). struct DebugStringOptions { // include original user comments as recorded in SourceLocation entries. N.B.