Merge pull request #570 from allight/inclusive

Update language to comply with Android's inclusive language guidance (remove "dummy").
This commit is contained in:
Gregory P. Smith 2020-07-28 18:40:58 -07:00 committed by GitHub
commit 10748b8973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
cpplint/cpplint.py vendored
View File

@ -1383,7 +1383,7 @@ def FindNextMultiLineCommentEnd(lines, lineix):
def RemoveMultiLineCommentsFromRange(lines, begin, end): def RemoveMultiLineCommentsFromRange(lines, begin, end):
"""Clears a range of lines for multi-line comments.""" """Clears a range of lines for multi-line comments."""
# Having // dummy comments makes the lines non-empty, so we will not get # Having // <empty> comments makes the lines non-empty, so we will not get
# unnecessary blank line warnings later in the code. # unnecessary blank line warnings later in the code.
for i in range(begin, end): for i in range(begin, end):
lines[i] = '/**/' lines[i] = '/**/'
@ -1757,7 +1757,7 @@ def CheckForCopyright(filename, lines, error):
"""Logs an error if no Copyright message appears at the top of the file.""" """Logs an error if no Copyright message appears at the top of the file."""
# We'll say it should occur by line 10. Don't forget there's a # We'll say it should occur by line 10. Don't forget there's a
# dummy line at the front. # placeholder line at the front.
for line in xrange(1, min(len(lines), 11)): for line in xrange(1, min(len(lines), 11)):
if re.search(r'Copyright', lines[line], re.I): break if re.search(r'Copyright', lines[line], re.I): break
else: # means no copyright line was found else: # means no copyright line was found