Merge pull request swiftlang#20829 from palimondo/not-fish-snake-scale

Author: swift-ci

utils/cmpcodesize/cmpcodesize/compare.py

@@ -169,7 +169,7 @@ def compare_sizes(old_sizes, new_sizes, name_key, title, total_size_key="",
 
         if total_size_key:
             if csv:
-                csv.writerow([title, name_key, 
+                csv.writerow([title, name_key,
                               old_size, old_size * 100.0 / old_total_size,
                               new_size, new_size * 100.0 / new_total_size,
                               perc])
@@ -190,7 +190,7 @@ def compare_sizes(old_sizes, new_sizes, name_key, title, total_size_key="",
                       (title, name_key, old_size, new_size, perc))
 
 
-def compare_sizes_of_file(old_files, new_files, all_sections, list_categories, 
+def compare_sizes_of_file(old_files, new_files, all_sections, list_categories,
                           csv=None):
     old_sizes = collections.defaultdict(int)
     new_sizes = collections.defaultdict(int)
@@ -214,13 +214,13 @@ def compare_sizes_of_file(old_files, new_files, all_sections, list_categories,
     if list_categories:
         for cat in categories:
             cat_name = cat[0]
-            compare_sizes(old_sizes, new_sizes, cat_name, "", "__text", 
+            compare_sizes(old_sizes, new_sizes, cat_name, "", "__text",
                           csv=csv)
 
     if all_sections:
         section_title = "    section"
 
-        compare_sizes(old_sizes, new_sizes, "__textcoal_nt", section_title, 
+        compare_sizes(old_sizes, new_sizes, "__textcoal_nt", section_title,
                       csv=csv)
         compare_sizes(old_sizes, new_sizes, "__stubs", section_title, csv=csv)
         compare_sizes(old_sizes, new_sizes, "__const", section_title, csv=csv)

utils/cmpcodesize/cmpcodesize/main.py

@@ -203,7 +203,7 @@ def main():
         if parsed_arguments.sum_sizes:
             compare_sizes_of_file(old_files, new_files,
                                   parsed_arguments.all_sections,
-                                  parsed_arguments.list_categories, 
+                                  parsed_arguments.list_categories,
                                   csv=csv_out)
         else:
             if len(old_files) != len(new_files):

utils/generate_confusables.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# utils/update_confusables.py - Utility to update definitions of unicode 
+# utils/update_confusables.py - Utility to update definitions of unicode
 # confusables
 #
 # This source file is part of the Swift.org open source project

utils/gyb_benchmark_support.py

@@ -50,7 +50,7 @@ def __init__(self, internal_name, external_name):
     KEY('SourceText', 'key.sourcetext'),
     KEY('EnableSyntaxMap', 'key.enablesyntaxmap'),
     KEY('SyntaxTreeTransferMode', 'key.syntaxtreetransfermode'),
-    KEY('SyntaxTreeSerializationFormat', 
+    KEY('SyntaxTreeSerializationFormat',
         'key.syntax_tree_serialization_format'),
     KEY('EnableStructure', 'key.enablesubstructure'),
     KEY('Description', 'key.description'),
@@ -413,8 +413,8 @@ def __init__(self, internal_name, external_name):
     KIND('SyntaxTreeOff', 'source.syntaxtree.transfer.off'),
     KIND('SyntaxTreeIncremental', 'source.syntaxtree.transfer.incremental'),
     KIND('SyntaxTreeFull', 'source.syntaxtree.transfer.full'),
-    KIND('SyntaxTreeSerializationJSON', 
+    KIND('SyntaxTreeSerializationJSON',
          'source.syntaxtree.serialization.format.json'),
-    KIND('SyntaxTreeSerializationByteTree', 
+    KIND('SyntaxTreeSerializationByteTree',
          'source.syntaxtree.serialization.format.bytetree'),
 ]

utils/gyb_sourcekit_support/UIDs.py

@@ -10,9 +10,9 @@
     Node('NonEmptyTokenList', kind='SyntaxCollection',
          element='Token', omit_when_empty=True),
 
-    # attribute -> '@' identifier '('? 
-    #              ( identifier 
-    #                | string-literal 
+    # attribute -> '@' identifier '('?
+    #              ( identifier
+    #                | string-literal
     #                | integer-literal
     #                | availability-spec-list
     #                | specialize-attr-spec-list
@@ -24,7 +24,7 @@
          An `@` attribute.
          ''',
          children=[
-             Child('AtSignToken', kind='AtSignToken', 
+             Child('AtSignToken', kind='AtSignToken',
                    description='The `@` sign.'),
              Child('AttributeName', kind='Token', classification='Attribute',
                    description='The name of the attribute.'),
@@ -38,10 +38,10 @@
                        Child('String', kind='StringLiteralToken'),
                        Child('Integer', kind='IntegerLiteralToken'),
                        Child('Availability', kind='AvailabilitySpecList'),
-                       Child('SpecializeArguments', 
+                       Child('SpecializeArguments',
                              kind='SpecializeAttributeSpecList'),
                        Child('ObjCName', kind='ObjCSelector'),
-                       Child('ImplementsArguments', 
+                       Child('ImplementsArguments',
                              kind='ImplementsAttributeArguments'),
                        Child('NamedAttributeString',
                              kind='NamedAttributeStringArgument'),
@@ -64,9 +64,9 @@
          element='Attribute'),
 
     # The argument of '@_specialize(...)'
-    # specialize-attr-spec-list -> labeled-specialize-entry 
+    # specialize-attr-spec-list -> labeled-specialize-entry
     #                                  specialize-spec-attr-list?
-    #                            | generic-where-clause 
+    #                            | generic-where-clause
     #                                  specialize-spec-attr-list?
     Node('SpecializeAttributeSpecList', kind='SyntaxCollection',
          description='''
@@ -87,11 +87,11 @@
          ''',
          traits=['WithTrailingComma'],
          children=[
-             Child('Label', kind='IdentifierToken', 
+             Child('Label', kind='IdentifierToken',
                    description='The label of the argument'),
-             Child('Colon', kind='ColonToken', 
+             Child('Colon', kind='ColonToken',
                    description='The colon separating the label and the value'),
-             Child('Value', kind='Token', 
+             Child('Value', kind='Token',
                    description='The value for this argument'),
              Child('TrailingComma', kind='CommaToken',
                    is_optional=True, description='''
@@ -131,7 +131,7 @@
                '''),
          ]),
     # The argument of '@_implements(...)'
-    # implements-attr-arguments -> simple-type-identifier ',' 
+    # implements-attr-arguments -> simple-type-identifier ','
     #                              (identifier | operator) decl-name-arguments
     Node('ImplementsAttributeArguments', kind='Syntax',
          description='''
@@ -143,7 +143,7 @@
                    The type for which the method with this attribute \
                    implements a requirement.
                    '''),
-             Child('Comma', kind='CommaToken', 
+             Child('Comma', kind='CommaToken',
                    description='''
                    The comma separating the type and method name
                    '''),
@@ -154,7 +154,7 @@
                        Child('Identifier', kind='IdentifierToken'),
                        Child('Operator', kind='PrefixOperatorToken'),
                    ]),
-             Child('DeclNameArguments', kind='DeclNameArguments', 
+             Child('DeclNameArguments', kind='DeclNameArguments',
                    is_optional=True, description='''
                    The argument labels of the protocol\'s requirement if it \
                    is a function requirement.

utils/gyb_syntax_support/AttributeNodes.py

@@ -3,11 +3,11 @@
 
 AVAILABILITY_NODES = [
     # availability-spec-list -> availability-entry availability-spec-list?
-    Node('AvailabilitySpecList', kind='SyntaxCollection', 
+    Node('AvailabilitySpecList', kind='SyntaxCollection',
          element='AvailabilityArgument'),
 
     # Wrapper for all the different entries that may occur inside @available
-    # availability-entry -> '*' ','? 
+    # availability-entry -> '*' ','?
     #                     | identifier ','?
     #                     | availability-version-restriction ','?
     #                     | availability-versioned-argument ','?
@@ -22,11 +22,11 @@
                    node_choices=[
                        Child('Star', kind='SpacedBinaryOperatorToken',
                              text_choices=['*']),
-                       Child('IdentifierRestriction', 
+                       Child('IdentifierRestriction',
                              kind='IdentifierToken'),
-                       Child('AvailabilityVersionRestriction', 
+                       Child('AvailabilityVersionRestriction',
                              kind='AvailabilityVersionRestriction'),
-                       Child('AvailabilityLabeledArgument', 
+                       Child('AvailabilityLabeledArgument',
                              kind='AvailabilityLabeledArgument'),
                    ]),
              Child('TrailingComma', kind='CommaToken', is_optional=True,
@@ -44,9 +44,9 @@
          a value, e.g. `message: "This has been deprecated"`.
          ''',
          children=[
-             Child('Label', kind='IdentifierToken', 
+             Child('Label', kind='IdentifierToken',
                    description='The label of the argument'),
-             Child('Colon', kind='ColonToken', 
+             Child('Colon', kind='ColonToken',
                    description='The colon separating label and value'),
              Child('Value', kind='Syntax',
                    node_choices=[
@@ -63,7 +63,7 @@
          certain platform to a version, e.g. `iOS 10` or `swift 3.4`.
          ''',
          children=[
-             Child('Platform', kind='IdentifierToken', 
+             Child('Platform', kind='IdentifierToken',
                    classification='Keyword',
                    description='''
                    The name of the OS on which the availability should be \
@@ -73,8 +73,8 @@
              Child('Version', kind='VersionTuple'),
          ]),
 
-    # version-tuple -> integer-literal 
-    #                | float-literal 
+    # version-tuple -> integer-literal
+    #                | float-literal
     #                | float-literal '.' integer-literal
     Node('VersionTuple', kind='Syntax',
          description='''
@@ -98,7 +98,7 @@
                    If the version contains a patch number, the period \
                    separating the minor from the patch number.
                    '''),
-             Child('PatchVersion', kind='IntegerLiteralToken', 
+             Child('PatchVersion', kind='IntegerLiteralToken',
                    is_optional=True, description='''
                    The patch version if specified.
                    '''),

utils/gyb_syntax_support/AvailabilityNodes.py

@@ -1,5 +1,5 @@
 from Node import error
-from kinds import lowercase_first_word
+from kinds import lowercase_first_word  # noqa: I201
 
 
 class SyntaxClassification(object):

utils/gyb_syntax_support/Classification.py

@@ -473,7 +473,7 @@
          traits=['Parenthesized'],
          children=[
              Child('Backslash', kind='BackslashToken'),
-             Child('LeftParen', kind='LeftParenToken', 
+             Child('LeftParen', kind='LeftParenToken',
                    classification='StringInterpolationAnchor',
                    force_classification=True),
              Child('Expression', kind='Expr'),
@@ -500,17 +500,17 @@
     Node('KeyPathExpr', kind='Expr',
          children=[
              Child('Backslash', kind='BackslashToken'),
-             Child('RootExpr', kind='Expr', is_optional=True, 
+             Child('RootExpr', kind='Expr', is_optional=True,
                    node_choices=[
                        Child('IdentifierExpr', kind='IdentifierExpr'),
                        Child('SpecializeExpr', kind='SpecializeExpr')
-                   ]), 
+                   ]),
              Child('Expression', kind='Expr'),
          ]),
 
-    # The period in the key path serves as the base on which the 
+    # The period in the key path serves as the base on which the
     # right-hand-side of the key path is evaluated
-    Node('KeyPathBaseExpr', kind='Expr', 
+    Node('KeyPathBaseExpr', kind='Expr',
          children=[
              Child('Period', kind='PeriodToken'),
          ]),

utils/gyb_syntax_support/ExprNodes.py

@@ -78,7 +78,7 @@ def is_buildable(self):
 
     def shall_be_omitted_when_empty(self):
         """
-        Returns 'True' if this node shall not be created while parsing if it 
+        Returns 'True' if this node shall not be created while parsing if it
         has no children.
         """
         return self.omit_when_empty