Bug 1971269 - Part 2: Remove support for legacy 'inlines.h' header files. r=spidermonkey-reviewers,jandem

Differential Revision: https://phabricator.services.mozilla.com/D255328

Author: anba

config/check_spidermonkey_style.py

@@ -11,7 +11,7 @@
 #
 # - No cyclic dependencies.
 #
-# - No normal header should #include a inlines.h/-inl.h file.
+# - No normal header should #include a -inl.h file.
 #
 # - #ifndef wrappers should have the right form. (XXX: not yet implemented)
 #   - Every header file should have one.
@@ -222,8 +222,6 @@
       -> tests/style/HeaderCycleB3-inl.h
          -> tests/style/HeaderCycleB4-inl.h
             -> tests/style/HeaderCycleB1-inl.h
-            -> tests/style/jsheadercycleB5inlines.h
-               -> tests/style/HeaderCycleB1-inl.h
       -> tests/style/HeaderCycleB4-inl.h
 
 """.splitlines(
@@ -264,7 +262,7 @@ def get(filename):
         if filename.endswith(".cpp"):
             return FileKind.CPP
 
-        if filename.endswith(("inlines.h", "-inl.h")):
+        if filename.endswith("-inl.h"):
             return FileKind.INL_H
 
         if filename.endswith((".h", ".hpp")):
@@ -393,13 +391,10 @@ def check_style(enable_fixup):
 
 
 def module_name(name):
-    """Strip the trailing .cpp, .h, inlines.h or -inl.h from a filename."""
+    """Strip the trailing .cpp, .h, or -inl.h from a filename."""
 
     return (
-        name.replace("inlines.h", "")
-        .replace("-inl.h", "")
-        .replace(".h", "")
-        .replace(".cpp", "")
+        name.replace("-inl.h", "").replace(".h", "").replace(".cpp", "")
     )  # NOQA: E501
 
 
@@ -449,21 +444,20 @@ def section(self, enclosing_inclname):
         """Identify which section inclname belongs to.
 
         The section numbers are as follows.
-          0. Module header (e.g. jsfoo.h or jsfooinlines.h within jsfoo.cpp)
+          0. Module header (e.g. jsfoo.h or jsfoo-inl.h within jsfoo.cpp)
           1. mozilla/Foo.h
           2. <foo.h> or <foo>
           3. jsfoo.h, prmjtime.h, etc
           4. foo/Bar.h
-          5. jsfooinlines.h
-          6. foo/Bar-inl.h
-          7. non-.h, e.g. *.tbl, *.msg (these can be scattered throughout files)
+          5. foo/Bar-inl.h
+          6. non-.h, e.g. *.tbl, *.msg (these can be scattered throughout files)
         """
 
         if self.is_system:
             return 2
 
         if not self.inclname.endswith((".h", ".hpp")):
-            return 7
+            return 6
 
         # A couple of modules have the .h file in js/ and the .cpp file elsewhere and so need
         # special handling.
@@ -475,13 +469,10 @@ def section(self, enclosing_inclname):
                 return 1
 
             if self.inclname.endswith("-inl.h"):
-                return 6
+                return 5
 
             return 4
 
-        if self.inclname.endswith("inlines.h"):
-            return 5
-
         return 3
 
     def quote(self):

js/src/tests/style/HeaderCycleB4-inl.h

@@ -1,2 +1 @@
-#include "tests/style/jsheadercycleB5inlines.h"
 #include "tests/style/HeaderCycleB1-inl.h"