Skip to content

Commit 30b9f88

Browse files
authored
Merge pull request #10603 from deannagarcia/3.19.x
Fix codespell errors
2 parents 8cccc0d + 184f584 commit 30b9f88

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
with:
1414
check_filenames: true
1515
skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
16-
ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,sur"
16+
ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,sur"

conformance/conformance_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ForkPipeRunner : public ConformanceTestRunner {
124124
// class MyConformanceTestSuite : public ConformanceTestSuite {
125125
// public:
126126
// void RunSuiteImpl() {
127-
// // INSERT ACTURAL TESTS.
127+
// // INSERT ACTUAL TESTS.
128128
// }
129129
// };
130130
//

csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public IList<FieldDescriptor> GetExtensionsInDeclarationOrder(MessageDescriptor
9393

9494
/// <summary>
9595
/// Returns a readonly list of all the extensions define in this type that extend
96-
/// the provided descriptor type in accending field order
96+
/// the provided descriptor type in ascending field order
9797
/// </summary>
9898
public IList<FieldDescriptor> GetExtensionsInNumberOrder(MessageDescriptor descriptor)
9999
{

objectivec/GPBCodedInputStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ CF_EXTERN_C_END
220220
/**
221221
* Moves the limit to the given byte offset starting at the current location.
222222
*
223-
* @exception GPBCodedInputStreamException If the requested bytes exceeed the
223+
* @exception GPBCodedInputStreamException If the requested bytes exceed the
224224
* current limit.
225225
*
226226
* @param byteLimit The number of bytes to move the limit, offset to the current

python/google/protobuf/internal/message_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ def testMapIteration(self):
21662166

21672167
def testMapItems(self):
21682168
# Map items used to have strange behaviors when use c extension. Because
2169-
# [] may reorder the map and invalidate any exsting iterators.
2169+
# [] may reorder the map and invalidate any existing iterators.
21702170
# TODO(jieluo): Check if [] reordering the map is a bug or intended
21712171
# behavior.
21722172
msg = map_unittest_pb2.TestMap()

src/google/protobuf/descriptor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ class PROTOBUF_EXPORT FieldDescriptor : private internal::SymbolBase {
881881

882882
// formats the default value appropriately and returns it as a string.
883883
// Must have a default value to call this. If quote_string_type is true, then
884-
// types of CPPTYPE_STRING whill be surrounded by quotes and CEscaped.
884+
// types of CPPTYPE_STRING will be surrounded by quotes and CEscaped.
885885
std::string DefaultValueAsString(bool quote_string_type) const;
886886

887887
// Helper function that returns the field type name for DebugString.

src/google/protobuf/text_format.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ class TextFormat::Parser::ParserImpl {
975975
}
976976

977977
// Consumes an identifier and saves its value in the identifier parameter.
978-
// Returns false if the token is not of type IDENTFIER.
978+
// Returns false if the token is not of type IDENTIFIER.
979979
bool ConsumeIdentifier(std::string* identifier) {
980980
if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
981981
*identifier = tokenizer_.current().text;
@@ -2272,7 +2272,7 @@ class MapEntryMessageComparator {
22722272
namespace internal {
22732273
class MapFieldPrinterHelper {
22742274
public:
2275-
// DynamicMapSorter::Sort cannot be used because it enfores syncing with
2275+
// DynamicMapSorter::Sort cannot be used because it enforces syncing with
22762276
// repeated field.
22772277
static bool SortMap(const Message& message, const Reflection* reflection,
22782278
const FieldDescriptor* field,

update_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def RewriteXml(filename, rewriter, add_xml_prefix=True):
6767
# document.toxml() always prepend the XML version without inserting new line.
6868
# We wants to preserve as much of the original formatting as possible, so we
6969
# will remove the default XML version and replace it with our custom one when
70-
# whever necessary.
70+
# whenever necessary.
7171
content = document.toxml().replace('<?xml version="1.0" ?>', '')
7272
file_handle = open(filename, 'wb')
7373
if add_xml_prefix:

0 commit comments

Comments
 (0)