Skip to content
Permalink
Browse files

Fix typos (#7050)

  • Loading branch information
bwignall authored and rafi-kamal committed Jan 8, 2020
1 parent 3214d0b commit a104dffcb6b1958a424f5fa6f9e6bdc0ab9b6f9e
Showing with 254 additions and 254 deletions.
  1. +2 −2 CHANGES.txt
  2. +1 −1 benchmarks/README.md
  3. +3 −3 conformance/Makefile.am
  4. +4 −4 conformance/binary_json_conformance_suite.cc
  5. +2 −2 conformance/conformance.proto
  6. +1 −1 conformance/conformance_test.h
  7. +3 −3 conformance/third_party/jsoncpp/json.h
  8. +1 −1 conformance/third_party/jsoncpp/jsoncpp.cpp
  9. +1 −1 csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_proto3.proto
  10. +1 −1 csharp/compatibility_tests/v3.0.0/test.sh
  11. +1 −1 csharp/protos/unittest.proto
  12. +1 −1 csharp/protos/unittest_custom_options_proto3.proto
  13. +1 −1 csharp/protos/unittest_proto3.proto
  14. +2 −2 csharp/src/Google.Protobuf.Conformance/Conformance.cs
  15. +1 −1 csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs
  16. +1 −1 csharp/src/Google.Protobuf/ExtensionRegistry.cs
  17. +1 −1 csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
  18. +1 −1 examples/WORKSPACE
  19. +1 −1 java/README.md
  20. +1 −1 java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/descriptor.proto
  21. +1 −1 java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_custom_options.proto
  22. +1 −1 java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_import.proto
  23. +1 −1 java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/descriptor.proto
  24. +1 −1 java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_custom_options.proto
  25. +1 −1 java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_import.proto
  26. +1 −1 java/compatibility_tests/v2.5.0/test.sh
  27. +2 −2 ...ompatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/LiteralByteStringTest.java
  28. +1 −1 java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
  29. +1 −1 java/core/src/main/java/com/google/protobuf/ExtensionSchemaLite.java
  30. +1 −1 java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
  31. +3 −3 java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
  32. +1 −1 java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
  33. +1 −1 java/core/src/main/java/com/google/protobuf/SchemaUtil.java
  34. +1 −1 java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
  35. +1 −1 java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
  36. +2 −2 java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
  37. +2 −2 java/core/src/test/java/com/google/protobuf/NioByteStringTest.java
  38. +1 −1 java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
  39. +1 −1 java/lite/src/test/java/com/google/protobuf/LiteTest.java
  40. +1 −1 js/binary/decoder.js
  41. +1 −1 js/binary/decoder_test.js
  42. +1 −1 js/binary/utils.js
  43. +1 −1 js/binary/utils_test.js
  44. +1 −1 js/binary/writer_test.js
  45. +3 −3 js/message.js
  46. +2 −2 kokoro/macos/prepare_build_macos_rc
  47. +2 −2 objectivec/DevTools/pddm.py
  48. +1 −1 objectivec/DevTools/pddm_tests.py
  49. +1 −1 objectivec/GPBBootstrap.h
  50. +1 −1 objectivec/GPBDictionary.m
  51. +2 −2 objectivec/GPBMessage.m
  52. +2 −2 objectivec/GPBUtilities.m
  53. +1 −1 objectivec/Tests/GPBDescriptorTests.m
  54. +15 −15 objectivec/Tests/GPBMessageTests+Merge.m
  55. +14 −14 objectivec/Tests/GPBMessageTests+Runtime.m
  56. +9 −9 objectivec/Tests/GPBMessageTests.m
  57. +1 −1 objectivec/Tests/GPBObjectiveCPlusPlusTest.mm
  58. +1 −1 objectivec/Tests/GPBSwiftTests.swift
  59. +1 −1 objectivec/Tests/unittest_extension_chain_f.proto
  60. +2 −2 php/ext/google/protobuf/array.c
  61. +2 −2 php/ext/google/protobuf/map.c
  62. +2 −2 php/ext/google/protobuf/message.c
  63. +1 −1 php/ext/google/protobuf/upb.c
  64. +2 −2 php/ext/google/protobuf/upb.h
  65. +1 −1 php/generate_descriptor_protos.sh
  66. +3 −3 php/src/Google/Protobuf/Any.php
  67. +3 −3 php/src/Google/Protobuf/Internal/CodedInputStream.php
  68. +1 −1 php/src/Google/Protobuf/Internal/GPBUtil.php
  69. +2 −2 php/src/Google/Protobuf/Internal/Message.php
  70. +1 −1 protobuf.bzl
  71. +1 −1 python/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/descriptor.proto
  72. +1 −1 python/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_custom_options.proto
  73. +1 −1 python/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_import.proto
  74. +1 −1 python/compatibility_tests/v2.5.0/test.sh
  75. +1 −1 python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/generator_test.py
  76. +1 −1 python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/service_reflection_test.py
  77. +1 −1 python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py
  78. +2 −2 python/google/protobuf/descriptor.py
  79. +2 −2 python/google/protobuf/descriptor_pool.py
  80. +1 −1 python/google/protobuf/internal/extension_dict.py
  81. +1 −1 python/google/protobuf/internal/text_format_test.py
  82. +1 −1 python/google/protobuf/internal/type_checkers.py
  83. +1 −1 python/google/protobuf/json_format.py
  84. +1 −1 python/google/protobuf/pyext/descriptor.cc
  85. +1 −1 python/google/protobuf/pyext/unknown_fields.cc
  86. +1 −1 python/mox.py
  87. +1 −1 ruby/compatibility_tests/v3.0.0/README.md
  88. +2 −2 ruby/ext/google/protobuf_c/defs.c
  89. +1 −1 ruby/ext/google/protobuf_c/upb.c
  90. +2 −2 ruby/ext/google/protobuf_c/upb.h
  91. +1 −1 ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
  92. +1 −1 src/google/protobuf/compiler/annotation_test_util.h
  93. +1 −1 src/google/protobuf/compiler/code_generator.cc
  94. +1 −1 src/google/protobuf/compiler/command_line_interface.cc
  95. +2 −2 src/google/protobuf/compiler/command_line_interface.h
  96. +1 −1 src/google/protobuf/compiler/command_line_interface_unittest.cc
  97. +1 −1 src/google/protobuf/compiler/cpp/cpp_file.cc
  98. +1 −1 src/google/protobuf/compiler/cpp/cpp_file.h
  99. +1 −1 src/google/protobuf/compiler/cpp/cpp_message.cc
  100. +1 −1 src/google/protobuf/compiler/importer.h
  101. +1 −1 src/google/protobuf/compiler/java/java_enum_field.cc
  102. +1 −1 src/google/protobuf/compiler/java/java_helpers.h
  103. +1 −1 src/google/protobuf/compiler/java/java_message_field.cc
  104. +1 −1 src/google/protobuf/compiler/java/java_names.h
  105. +1 −1 src/google/protobuf/compiler/java/java_primitive_field.cc
  106. +1 −1 src/google/protobuf/compiler/java/java_string_field.cc
  107. +1 −1 src/google/protobuf/compiler/java/java_string_field_lite.cc
  108. +1 −1 src/google/protobuf/compiler/objectivec/objectivec_field.cc
  109. +1 −1 src/google/protobuf/compiler/parser.cc
  110. +2 −2 src/google/protobuf/compiler/php/php_generator.cc
  111. +1 −1 src/google/protobuf/compiler/plugin.h
  112. +2 −2 src/google/protobuf/compiler/ruby/ruby_generator.cc
  113. +3 −3 src/google/protobuf/descriptor.cc
  114. +2 −2 src/google/protobuf/descriptor.h
  115. +3 −3 src/google/protobuf/descriptor_unittest.cc
  116. +1 −1 src/google/protobuf/dynamic_message_unittest.cc
  117. +1 −1 src/google/protobuf/extension_set.h
  118. +1 −1 src/google/protobuf/generated_message_reflection.cc
  119. +1 −1 src/google/protobuf/generated_message_util.h
  120. +2 −2 src/google/protobuf/io/coded_stream.h
  121. +1 −1 src/google/protobuf/io/io_win32_unittest.cc
  122. +2 −2 src/google/protobuf/io/printer.h
  123. +1 −1 src/google/protobuf/io/tokenizer_unittest.cc
  124. +2 −2 src/google/protobuf/io/zero_copy_stream_impl_lite.h
  125. +1 −1 src/google/protobuf/map_entry_lite.h
  126. +4 −4 src/google/protobuf/map_test.cc
  127. +1 −1 src/google/protobuf/message.cc
  128. +1 −1 src/google/protobuf/message.h
  129. +2 −2 src/google/protobuf/message_unittest.inc
  130. +2 −2 src/google/protobuf/metadata_lite.h
  131. +1 −1 src/google/protobuf/parse_context.h
  132. +1 −1 src/google/protobuf/reflection_internal.h
  133. +1 −1 src/google/protobuf/repeated_field.h
  134. +1 −1 src/google/protobuf/repeated_field_reflection_unittest.cc
  135. +1 −1 src/google/protobuf/service.h
  136. +1 −1 src/google/protobuf/stubs/bytestream.h
  137. +1 −1 src/google/protobuf/stubs/callback.h
  138. +1 −1 src/google/protobuf/stubs/common.h
  139. +1 −1 src/google/protobuf/stubs/statusor.h
  140. +1 −1 src/google/protobuf/stubs/structurally_valid.cc
  141. +1 −1 src/google/protobuf/stubs/time.cc
  142. +1 −1 src/google/protobuf/stubs/time.h
  143. +1 −1 src/google/protobuf/stubs/time_test.cc
  144. +1 −1 src/google/protobuf/text_format_unittest.cc
  145. +1 −1 src/google/protobuf/unittest.proto
  146. +1 −1 src/google/protobuf/unittest_custom_options.proto
  147. +1 −1 src/google/protobuf/unittest_proto3.proto
  148. +1 −1 src/google/protobuf/unittest_proto3_arena.proto
  149. +1 −1 src/google/protobuf/unittest_proto3_arena_lite.proto
  150. +1 −1 src/google/protobuf/unittest_proto3_lite.proto
  151. +2 −2 src/google/protobuf/util/field_mask_util_test.cc
  152. +1 −1 src/google/protobuf/util/internal/datapiece.h
  153. +1 −1 src/google/protobuf/util/internal/default_value_objectwriter_test.cc
  154. +1 −1 src/google/protobuf/util/internal/field_mask_utility.cc
  155. +1 −1 src/google/protobuf/util/internal/proto_writer.h
  156. +1 −1 src/google/protobuf/util/internal/protostream_objectwriter.h
  157. +1 −1 src/google/protobuf/util/json_util_test.cc
  158. +3 −3 src/google/protobuf/util/message_differencer.cc
  159. +1 −1 src/google/protobuf/util/time_util_test.cc
  160. +1 −1 src/google/protobuf/util/type_resolver.h
  161. +2 −2 src/google/protobuf/wire_format.h
  162. +1 −1 src/google/protobuf/wire_format_lite.h
  163. +3 −3 tests.sh
@@ -265,7 +265,7 @@
* Introduce Proto C API.
* FindFileContainingSymbol in descriptor pool is now able to find field and enum values.
* reflection.MakeClass() and reflection.ParseMessage() are deprecated.
* Added DescriptorPool.FindMethodByName() method in pure python (c extension alreay has it)
* Added DescriptorPool.FindMethodByName() method in pure python (c extension already has it)
* Flipped proto3 to preserve unknown fields by default.
* Added support for memoryview in python3 proto message parsing.
* Added MergeFrom for repeated scalar fields in c extension (pure python already has it)
@@ -428,7 +428,7 @@
PHP
* Fixed memory leak in C-extension implementation.
* Added discardUnknokwnFields API.
* Removed duplicatd typedef in C-extension headers.
* Removed duplicated typedef in C-extension headers.
* Avoided calling private php methods (timelib_update_ts).
* Fixed Any.php to use fully-qualified name for DescriptorPool.

@@ -168,7 +168,7 @@ $ ./cpp-benchmark $(specific generated dataset file name) [$(benchmark options)]

### Python:

For Python benchmark we have `--json` for outputing the json result
For Python benchmark we have `--json` for outputting the json result

#### Pure Python:

@@ -218,7 +218,7 @@ conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \
nodist_conformance_test_runner_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc google/protobuf/test_messages_proto2.pb.cc
conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
conformance_test_runner_CXXFLAGS = -std=c++11
# Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check"
# Explicit deps because BUILT_SOURCES are only done before a "make all/check"
# so a direct "make test_cpp" could fail if parallel enough.
conformance_test_runner-conformance_test.$(OBJEXT): conformance.pb.h
conformance_test_runner-conformance_test_runner.$(OBJEXT): conformance.pb.h
@@ -227,7 +227,7 @@ conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la
conformance_cpp_SOURCES = conformance_cpp.cc
nodist_conformance_cpp_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc google/protobuf/test_messages_proto2.pb.cc
conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src
# Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check"
# Explicit dep because BUILT_SOURCES are only done before a "make all/check"
# so a direct "make test_cpp" could fail if parallel enough.
conformance_cpp-conformance_cpp.$(OBJEXT): conformance.pb.h

@@ -243,7 +243,7 @@ nodist_conformance_objc_SOURCES = Conformance.pbobjc.m google/protobuf/TestMessa
# setup for Xcode and old frameworks are being found.
conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk macosx --show-sdk-path`
conformance_objc_LDFLAGS = -framework Foundation
# Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check"
# Explicit dep because BUILT_SOURCES are only done before a "make all/check"
# so a direct "make test_objc" could fail if parallel enough.
conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h google/protobuf/TestMessagesProto2.pbobjc.h google/protobuf/TestMessagesProto3.pbobjc.h

@@ -1973,7 +1973,7 @@ void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
ExpectParseFailureForJson(
"Uint64FieldNotNumber", REQUIRED,
R"({"optionalUint64": "3x3"})");
// JSON does not allow "+" on numric values.
// JSON does not allow "+" on numeric values.
ExpectParseFailureForJson(
"Int32FieldPlusSign", REQUIRED,
R"({"optionalInt32": +1})");
@@ -2080,7 +2080,7 @@ void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
"FloatFieldNegativeInfinity", REQUIRED,
R"({"optionalFloat": "-Infinity"})",
"optional_float: -inf");
// Non-cannonical Nan will be correctly normalized.
// Non-canonical Nan will be correctly normalized.
{
TestAllTypesProto3 message;
// IEEE floating-point standard 32-bit quiet NaN:
@@ -2139,7 +2139,7 @@ void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
"DoubleFieldQuotedValue", REQUIRED,
R"({"optionalDouble": "1"})",
"optional_double: 1");
// Speical values.
// Special values.
RunValidJsonTest(
"DoubleFieldNan", REQUIRED,
R"({"optionalDouble": "NaN"})",
@@ -2152,7 +2152,7 @@ void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
"DoubleFieldNegativeInfinity", REQUIRED,
R"({"optionalDouble": "-Infinity"})",
"optional_double: -inf");
// Non-cannonical Nan will be correctly normalized.
// Non-canonical Nan will be correctly normalized.
{
TestAllTypesProto3 message;
message.set_optional_double(
@@ -113,7 +113,7 @@ message ConformanceRequest {
string message_type = 4;

// Each test is given a specific test category. Some category may need
// spedific support in testee programs. Refer to the defintion of TestCategory
// spedific support in testee programs. Refer to the definition of TestCategory
// for more information.
TestCategory test_category = 5;

@@ -170,7 +170,7 @@ message ConformanceResponse {

// Encoding options for jspb format.
message JspbEncodingConfig {
// Encode the value field of Any as jspb array if ture, otherwise binary.
// Encode the value field of Any as jspb array if true, otherwise binary.
bool use_jspb_array_any_format = 1;
}

@@ -191,7 +191,7 @@ class ConformanceTestSuite {
// Test cases are classified into a few categories:
// REQUIRED: the test case must be passed for an implementation to be
// interoperable with other implementations. For example, a
// parser implementaiton must accept both packed and unpacked
// parser implementation must accept both packed and unpacked
// form of repeated primitive fields.
// RECOMMENDED: the test case is not required for the implementation to
// be interoperable with other implementations, but is
@@ -1019,7 +1019,7 @@ class JSON_API PathArgument {
* - ".name1.name2.name3"
* - ".[0][1][2].name1[3]"
* - ".%" => member name is provided as parameter
* - ".[%]" => index is provied as parameter
* - ".[%]" => index is provided as parameter
*/
class JSON_API Path {
public:
@@ -1371,7 +1371,7 @@ class JSON_API Reader {
*/
std::string getFormattedErrorMessages() const;

/** \brief Returns a vector of structured erros encounted while parsing.
/** \brief Returns a vector of structured errors encounted while parsing.
* \return A (possibly empty) vector of StructuredError objects. Currently
* only one error can be returned, but the caller should tolerate
* multiple
@@ -1816,7 +1816,7 @@ class JSON_API Writer {
*
* The JSON document is written in a single line. It is not intended for 'human'
*consumption,
* but may be usefull to support feature such as RPC where bandwith is limited.
* but may be useful to support feature such as RPC where bandwidth is limited.
* \sa Reader, Value
* \deprecated Use StreamWriterBuilder.
*/
@@ -4112,7 +4112,7 @@ std::string valueToString(double value, bool useSpecialFloats, unsigned int prec
sprintf(formatString, "%%.%dg", precision);

// Print into the buffer. We need not request the alternative representation
// that always has a decimal point because JSON doesn't distingish the
// that always has a decimal point because JSON doesn't distinguish the
// concepts of reals and integers.
if (isfinite(value)) {
len = snprintf(buffer, sizeof(buffer), formatString, value);
@@ -142,7 +142,7 @@ message TestAllTypes {
}
}

// This proto includes a recusively nested message.
// This proto includes a recursively nested message.
message NestedTestAllTypes {
NestedTestAllTypes child = 1;
TestAllTypes payload = 2;
@@ -37,7 +37,7 @@ TEST_VERSION=3.0.0
# The old version of protobuf that we are testing compatibility against. This
# is usually the same as TEST_VERSION (i.e., we use the tests extracted from
# that version to test compatibility of the newest runtime against it), but it
# is also possible to use this same test set to test the compatibiilty of the
# is also possible to use this same test set to test the compatibility of the
# latest version against other versions.
OLD_VERSION=$1
OLD_VERSION_PROTOC=http://repo1.maven.org/maven2/com/google/protobuf/protoc/$OLD_VERSION/protoc-$OLD_VERSION-linux-x86_64.exe
@@ -182,7 +182,7 @@ message TestAllTypes {
}
}

// This proto includes a recusively nested message.
// This proto includes a recursively nested message.
message NestedTestAllTypes {
optional NestedTestAllTypes child = 1;
optional TestAllTypes payload = 2;
@@ -286,7 +286,7 @@ message Aggregate {
}

// Allow Aggregate to be used as an option at all possible locations
// in the .proto grammer.
// in the .proto grammar.
extend google.protobuf.FileOptions { Aggregate fileopt = 15478479; }
extend google.protobuf.MessageOptions { Aggregate msgopt = 15480088; }
extend google.protobuf.FieldOptions { Aggregate fieldopt = 15481374; }
@@ -130,7 +130,7 @@ message TestAllTypes {
}
}

// This proto includes a recusively nested message.
// This proto includes a recursively nested message.
message NestedTestAllTypes {
NestedTestAllTypes child = 1;
TestAllTypes payload = 2;
@@ -370,7 +370,7 @@ public sealed partial class ConformanceRequest : pb::IMessage<ConformanceRequest
private global::Conformance.TestCategory testCategory_ = global::Conformance.TestCategory.UnspecifiedTest;
/// <summary>
/// Each test is given a specific test category. Some category may need
/// spedific support in testee programs. Refer to the defintion of TestCategory
/// spedific support in testee programs. Refer to the definition of TestCategory
/// for more information.
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1110,7 +1110,7 @@ public sealed partial class JspbEncodingConfig : pb::IMessage<JspbEncodingConfig
public const int UseJspbArrayAnyFormatFieldNumber = 1;
private bool useJspbArrayAnyFormat_;
/// <summary>
/// Encode the value field of Any as jspb array if ture, otherwise binary.
/// Encode the value field of Any as jspb array if true, otherwise binary.
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool UseJspbArrayAnyFormat {
@@ -1773,7 +1773,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
}

/// <summary>
/// This proto includes a recusively nested message.
/// This proto includes a recursively nested message.
/// </summary>
public sealed partial class NestedTestAllTypes : pb::IMessage<NestedTestAllTypes> {
private static readonly pb::MessageParser<NestedTestAllTypes> _parser = new pb::MessageParser<NestedTestAllTypes>(() => new NestedTestAllTypes());
@@ -96,7 +96,7 @@ public void Add(Extension extension)
}

/// <summary>
/// Adds the specified extensions to the reigstry
/// Adds the specified extensions to the registry
/// </summary>
public void AddRange(IEnumerable<Extension> extensions)
{
@@ -85,7 +85,7 @@ public IList<MethodDescriptor> Methods
/// Finds a method by name.
/// </summary>
/// <param name="name">The unqualified name of the method (e.g. "Foo").</param>
/// <returns>The method's decsriptor, or null if not found.</returns>
/// <returns>The method's descriptor, or null if not found.</returns>
public MethodDescriptor FindMethodByName(String name)
{
return File.DescriptorPool.FindSymbol<MethodDescriptor>(FullName + "." + name);
@@ -19,7 +19,7 @@ local_repository(
)

# Similar to com_google_protobuf but for Java lite. If you are building
# for Android, the lite version should be prefered because it has a much
# for Android, the lite version should be preferred because it has a much
# smaller code size.
local_repository(
name = "com_google_protobuf_javalite",
@@ -146,7 +146,7 @@ library (without the util package).
are guaranteed for minor version releases if the user follows the guideline
described in this section.

* Protobuf major version releases may also be backwards-compatbile with the
* Protobuf major version releases may also be backwards-compatible with the
last release of the previous major version. See the release notice for more
details.

@@ -228,7 +228,7 @@ message MethodDescriptorProto {
// * For options which will be published and used publicly by multiple
// independent entities, e-mail protobuf-global-extension-registry@google.com
// to reserve extension numbers. Simply provide your project name (e.g.
// Object-C plugin) and your porject website (if available) -- there's no need
// Object-C plugin) and your project website (if available) -- there's no need
// to explain how you intend to use them. Usually you only need one extension
// number. You can declare multiple options with only one extension number by
// putting them in a sub-message. See the Custom Options section of the docs
@@ -321,7 +321,7 @@ message Aggregate {
}

// Allow Aggregate to be used as an option at all possible locations
// in the .proto grammer.
// in the .proto grammar.
extend google.protobuf.FileOptions { optional Aggregate fileopt = 15478479; }
extend google.protobuf.MessageOptions { optional Aggregate msgopt = 15480088; }
extend google.protobuf.FieldOptions { optional Aggregate fieldopt = 15481374; }
@@ -43,7 +43,7 @@ package protobuf_unittest_import;

option optimize_for = SPEED;

// Excercise the java_package option.
// Exercise the java_package option.
option java_package = "com.google.protobuf.test";

// Do not set a java_outer_classname here to verify that Proto2 works without
@@ -228,7 +228,7 @@ message MethodDescriptorProto {
// * For options which will be published and used publicly by multiple
// independent entities, e-mail protobuf-global-extension-registry@google.com
// to reserve extension numbers. Simply provide your project name (e.g.
// Object-C plugin) and your porject website (if available) -- there's no need
// Object-C plugin) and your project website (if available) -- there's no need
// to explain how you intend to use them. Usually you only need one extension
// number. You can declare multiple options with only one extension number by
// putting them in a sub-message. See the Custom Options section of the docs
@@ -321,7 +321,7 @@ message Aggregate {
}

// Allow Aggregate to be used as an option at all possible locations
// in the .proto grammer.
// in the .proto grammar.
extend google.protobuf.FileOptions { optional Aggregate fileopt = 15478479; }
extend google.protobuf.MessageOptions { optional Aggregate msgopt = 15480088; }
extend google.protobuf.FieldOptions { optional Aggregate fieldopt = 15481374; }
@@ -43,7 +43,7 @@ package protobuf_unittest_import;

option optimize_for = SPEED;

// Excercise the java_package option.
// Exercise the java_package option.
option java_package = "com.google.protobuf.test";

// Do not set a java_outer_classname here to verify that Proto2 works without
@@ -15,7 +15,7 @@ TEST_VERSION=`grep "^ <version>.*</version>" pom.xml | sed "s| <version>\(.*\)
# The old version of protobuf that we are testing compatibility against. This
# is usually the same as TEST_VERSION (i.e., we use the tests extracted from
# that version to test compatibility of the newest runtime against it), but it
# is also possible to use this same test set to test the compatibiilty of the
# is also possible to use this same test set to test the compatibility of the
# latest version against other versions.
OLD_VERSION=$1
OLD_VERSION_PROTOC=https://repo1.maven.org/maven2/com/google/protobuf/protoc/$OLD_VERSION/protoc-$OLD_VERSION-linux-x86_64.exe
@@ -87,7 +87,7 @@ public void testByteIterator() {
stillEqual = (iter.hasNext() && referenceBytes[i] == iter.nextByte());
}
assertTrue(classUnderTest + " must capture the right bytes", stillEqual);
assertFalse(classUnderTest + " must have exhausted the itertor", iter.hasNext());
assertFalse(classUnderTest + " must have exhausted the iterator", iter.hasNext());

try {
iter.nextByte();
@@ -317,7 +317,7 @@ public void testNewInput_skip() throws IOException {
assertEquals("InputStream.skip(), no more input", 0, input.available());
assertEquals("InputStream.skip(), no more input", -1, input.read());
input.reset();
assertEquals("InputStream.reset() succeded",
assertEquals("InputStream.reset() succeeded",
stringSize - skipped1, input.available());
assertEquals("InputStream.reset(), read()",
stringUnderTest.byteAt(nearEndIndex) & 0xFF, input.read());
@@ -873,7 +873,7 @@ static int decodeExtension(
}
} else {
Object value = null;
// Enum is a special case becasue unknown enum values will be put into UnknownFieldSetLite.
// Enum is a special case because unknown enum values will be put into UnknownFieldSetLite.
if (extension.getLiteType() == WireFormat.FieldType.ENUM) {
position = decodeVarint32(data, position, registers);
Object enumValue = extension.descriptor.getEnumType().findValueByNumber(registers.int1);
@@ -193,7 +193,7 @@ void makeImmutable(Object message) {
extensions.setField(extension.descriptor, value);
} else {
Object value = null;
// Enum is a special case becasue unknown enum values will be put into UnknownFieldSetLite.
// Enum is a special case because unknown enum values will be put into UnknownFieldSetLite.
if (extension.getLiteType() == WireFormat.FieldType.ENUM) {
int number = reader.readInt32();
Object enumValue = extension.descriptor.getEnumType().findValueByNumber(number);
@@ -359,7 +359,7 @@ protected void makeExtensionsImmutable() {
* TODO(xiaofeng): remove this after b/29368482 is fixed. We need to move this
* interface to AbstractMessage in order to versioning GeneratedMessage but
* this move breaks binary compatibility for AppEngine. After AppEngine is
* fixed we can exlude this from google3.
* fixed we can exclude this from google3.
*/
protected interface BuilderParent extends AbstractMessage.BuilderParent {}

@@ -515,7 +515,7 @@ protected void makeExtensionsImmutable() {
* TODO(xiaofeng): remove this after b/29368482 is fixed. We need to move this
* interface to AbstractMessage in order to versioning GeneratedMessageV3 but
* this move breaks binary compatibility for AppEngine. After AppEngine is
* fixed we can exlude this from google3.
* fixed we can exclude this from google3.
*/
protected interface BuilderParent extends AbstractMessage.BuilderParent {}

@@ -3086,7 +3086,7 @@ protected static void writeStringNoTag(
serializeMapTo(out, m, defaultEntry, fieldNumber);
return;
}
// Sorting the unboxed keys and then look up the values during serialziation is 2x faster
// Sorting the unboxed keys and then look up the values during serialization is 2x faster
// than sorting map entries with a custom comparator directly.
int[] keys = new int[m.size()];
int index = 0;
@@ -3142,7 +3142,7 @@ protected static void writeStringNoTag(
return;
}

// Sorting the String keys and then look up the values during serialziation is 25% faster than
// Sorting the String keys and then look up the values during serialization is 25% faster than
// sorting map entries with a custom comparator directly.
String[] keys = new String[m.size()];
keys = m.keySet().toArray(keys);

0 comments on commit a104dff

Please sign in to comment.
You can’t perform that action at this time.