Fix up clang-format header config for cinderx move

Summary: Update our clang-format rules to try and keep things about as they were before all of our internal includes were relative to `cinderx/`. I decided on a formal separation between third-party code in `cinderx/ThirdParty` and elsewhere, but other than that the only changes here should be when a `cinderx/` prefix affected the sort order within a category. Reviewed By: alexmalyshev Differential Revision: D52808612 fbshipit-source-id: 982f654f86740e77f367d31d19373261494bfa51
facebookincubator · Jan 16, 2024 · 9ababf5 · 9ababf5
1 parent c4f1666
commit 9ababf5
Show file tree

Hide file tree

Showing 24 changed files with 46 additions and 33 deletions.
diff --git a/cinderx/.cpp-clang-format b/cinderx/.cpp-clang-format
@@ -48,16 +48,22 @@ IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:     '<gtest/.*>'
     Priority:  1
-  - Regex:     '"Jit/.*"'
+  - Regex:     '"cinderx/Jit/.*"'
     Priority:  3
-  - Regex:     '"RuntimeTests/.*"'
+  - Regex:     '"cinderx/RuntimeTests/.*"'
     Priority:  4
-  - Regex:     '".*"'
+# Third-party headers that we've vendored in are grouped right before other
+# third-party code.
+  - Regex:     '"cinderx/ThirdParty/.*"'
+    Priority:  5
+# Any other paths in cinderx/ are assumed to be files that used to be in
+# upstream directories, so we group their includes with upstream files.
+  - Regex:     '"(cinderx/)?.*"'
     Priority:  2
   - Regex:     '^<.*\.h(pp)?>'
-    Priority:  5
-  - Regex:     '^<.*'
     Priority:  6
+  - Regex:     '^<.*'
+    Priority:  7
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false

diff --git a/cinderx/Jit/bytecode.h b/cinderx/Jit/bytecode.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/bytecode_offsets.h"
 #include "cinderx/Jit/log.h"

diff --git a/cinderx/Jit/code_allocator.h b/cinderx/Jit/code_allocator.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include "cinderx/ThirdParty/asmjit/src/asmjit/asmjit.h"
-
 #include "cinderx/Jit/codegen/code_section.h"
 #include "cinderx/Jit/log.h"
 
+#include "cinderx/ThirdParty/asmjit/src/asmjit/asmjit.h"
+
 #include <memory>
 #include <vector>
 

diff --git a/cinderx/Jit/codegen/gen_asm.cpp b/cinderx/Jit/codegen/gen_asm.cpp
@@ -3,8 +3,8 @@
 #include "cinderx/Jit/codegen/gen_asm.h"
 
 #include "Python.h"
-#include "cinderx/StaticPython/classloader.h"
 #include "cinder/exports.h"
+#include "cinderx/StaticPython/classloader.h"
 #include "frameobject.h"
 #include "internal/pycore_pystate.h"
 #include "internal/pycore_shadow_frame.h"

diff --git a/cinderx/Jit/codegen/gen_asm.h b/cinderx/Jit/codegen/gen_asm.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/bitvector.h"
 #include "cinderx/Jit/codegen/environ.h"

diff --git a/cinderx/Jit/frame.cpp b/cinderx/Jit/frame.cpp
@@ -5,10 +5,11 @@
 #include "Python.h"
 #include "cinder/exports.h"
 #include "cinder/genobject_jit.h"
-#include "cinderx/Jit/bytecode_offsets.h"
 #include "internal/pycore_pystate.h"
 #include "internal/pycore_shadow_frame.h"
 #include "pycore_object.h"
+
+#include "cinderx/Jit/bytecode_offsets.h"
 #include "cinderx/Jit/debug_info.h"
 #include "cinderx/Jit/log.h"
 #include "cinderx/Jit/runtime.h"

diff --git a/cinderx/Jit/hir/builder.cpp b/cinderx/Jit/hir/builder.cpp
@@ -2,12 +2,12 @@
 
 #include "cinderx/Jit/hir/builder.h"
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
-#include "cinderx/StaticPython/checked_dict.h"
-#include "cinderx/StaticPython/checked_list.h"
 #include "boolobject.h"
 #include "ceval.h"
+#include "cinderx/Interpreter/opcode.h"
+#include "cinderx/StaticPython/checked_dict.h"
+#include "cinderx/StaticPython/checked_list.h"
 #include "object.h"
 #include "preload.h"
 #include "structmember.h"

diff --git a/cinderx/Jit/hir/hir.h b/cinderx/Jit/hir/hir.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 #include "code.h"
 
 #include "cinderx/Jit/bytecode.h"

diff --git a/cinderx/Jit/hir/preload.cpp b/cinderx/Jit/hir/preload.cpp
@@ -2,8 +2,8 @@
 
 #include "cinderx/Jit/hir/preload.h"
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/bytecode.h"
 #include "cinderx/Jit/codegen/gen_asm.h"

diff --git a/cinderx/Jit/hir/printer.cpp b/cinderx/Jit/hir/printer.cpp
@@ -8,9 +8,10 @@
 #include "cinderx/Jit/runtime.h"
 #include "cinderx/Jit/util.h"
 
+#include "cinderx/ThirdParty/json/json.hpp"
+
 #include <fmt/format.h>
 #include <fmt/ostream.h>
-#include "cinderx/ThirdParty/json/json.hpp"
 
 #include <algorithm>
 #include <fstream>

diff --git a/cinderx/Jit/inline_cache.cpp b/cinderx/Jit/inline_cache.cpp
@@ -2,9 +2,9 @@
 
 #include "cinderx/Jit/inline_cache.h"
 
-#include "cinderx/Common/watchers.h"
 #include "Objects/dict-common.h"
 #include "Python.h"
+#include "cinderx/Common/watchers.h"
 #include "cinderx/StaticPython/strictmoduleobject.h"
 
 #include "cinderx/Jit/codegen/gen_asm.h"

diff --git a/cinderx/Jit/jit_rt.cpp b/cinderx/Jit/jit_rt.cpp
@@ -4,8 +4,8 @@
 
 #include "Objects/dict-common.h"
 #include "Python.h"
-#include "cinderx/StaticPython/classloader.h"
 #include "cinder/exports.h"
+#include "cinderx/StaticPython/classloader.h"
 #include "frameobject.h"
 #include "listobject.h"
 #include "object.h"

diff --git a/cinderx/Jit/jit_time_log.cpp b/cinderx/Jit/jit_time_log.cpp
@@ -6,9 +6,10 @@
 
 #include "cinderx/Jit/log.h"
 
-#include <fmt/format.h>
 #include "cinderx/ThirdParty/parallel-hashmap/parallel_hashmap/phmap.h"
 
+#include <fmt/format.h>
+
 #include <iostream>
 #include <memory>
 #include <sstream>

diff --git a/cinderx/Jit/lir/generator.cpp b/cinderx/Jit/lir/generator.cpp
@@ -2,11 +2,11 @@
 
 #include "cinderx/Jit/lir/generator.h"
 
-#include "cinderx/Interpreter/interpreter.h"
 #include "Python.h"
+#include "cinder/exports.h"
+#include "cinderx/Interpreter/interpreter.h"
 #include "cinderx/StaticPython/checked_dict.h"
 #include "cinderx/StaticPython/checked_list.h"
-#include "cinder/exports.h"
 #include "internal/pycore_import.h"
 #include "internal/pycore_interp.h"
 #include "internal/pycore_pyerrors.h"

diff --git a/cinderx/Jit/profile_runtime.cpp b/cinderx/Jit/profile_runtime.cpp
@@ -2,9 +2,9 @@
 
 #include "cinderx/Jit/profile_runtime.h"
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Objects/dict-common.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 #include "frameobject.h"
 
 #include "cinderx/Jit/hir/type.h"

diff --git a/cinderx/Jit/pyjit.cpp b/cinderx/Jit/pyjit.cpp
@@ -5,6 +5,11 @@
 #include "Python.h"
 #include "cinder/exports.h"
 #include "cinder/genobject_jit.h"
+#include "cinderx/StrictModules/pystrictmodule.h"
+#include "internal/pycore_ceval.h"
+#include "internal/pycore_shadow_frame.h"
+#include "pycore_interp.h"
+
 #include "cinderx/Jit/code_allocator.h"
 #include "cinderx/Jit/codegen/gen_asm.h"
 #include "cinderx/Jit/config.h"
@@ -24,13 +29,10 @@
 #include "cinderx/Jit/profile_runtime.h"
 #include "cinderx/Jit/ref.h"
 #include "cinderx/Jit/runtime.h"
-#include "internal/pycore_ceval.h"
-#include "internal/pycore_shadow_frame.h"
-#include "pycore_interp.h"
 #include "cinderx/Jit/strobelight_exports.h"
 #include "cinderx/Jit/type_profiler.h"
 #include "cinderx/Jit/util.h"
-#include "cinderx/StrictModules/pystrictmodule.h"
+
 #include "cinderx/ThirdParty/i386-dis/dis-asm.h"
 
 #include <atomic>

diff --git a/cinderx/Jit/runtime.h b/cinderx/Jit/runtime.h
@@ -4,6 +4,7 @@
 
 #include "Python.h"
 #include "cinder/genobject_jit.h"
+
 #include "cinderx/Jit/containers.h"
 #include "cinderx/Jit/debug_info.h"
 #include "cinderx/Jit/deopt.h"

diff --git a/cinderx/RuntimeTests/bytecode_test.cpp b/cinderx/RuntimeTests/bytecode_test.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Facebook, Inc. and its affiliates. (http://www.facebook.com)
 #include <gtest/gtest.h>
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/bytecode.h"
 

diff --git a/cinderx/RuntimeTests/cmdline_test.cpp b/cinderx/RuntimeTests/cmdline_test.cpp
@@ -13,6 +13,7 @@
 #include "cinderx/RuntimeTests/testutil.h"
 
 #include "cinderx/ThirdParty/i386-dis/dis-asm.h"
+
 #include <fmt/format.h>
 
 #include <cstdlib>

diff --git a/cinderx/RuntimeTests/deopt_test.cpp b/cinderx/RuntimeTests/deopt_test.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Facebook, Inc. and its affiliates. (http://www.facebook.com)
 #include <gtest/gtest.h>
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/codegen/gen_asm.h"
 #include "cinderx/Jit/codegen/x86_64.h"

diff --git a/cinderx/RuntimeTests/hir_frame_state_test.cpp b/cinderx/RuntimeTests/hir_frame_state_test.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Facebook, Inc. and its affiliates. (http://www.facebook.com)
 #include <gtest/gtest.h>
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/hir/builder.h"
 #include "cinderx/Jit/hir/hir.h"

diff --git a/cinderx/RuntimeTests/hir_operand_type_test.cpp b/cinderx/RuntimeTests/hir_operand_type_test.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Facebook, Inc. and its affiliates. (http://www.facebook.com)
 #include <gtest/gtest.h>
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/hir/analysis.h"
 #include "cinderx/Jit/hir/hir.h"

diff --git a/cinderx/RuntimeTests/hir_test.cpp b/cinderx/RuntimeTests/hir_test.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Facebook, Inc. and its affiliates. (http://www.facebook.com)
 #include <gtest/gtest.h>
 
-#include "cinderx/Interpreter/opcode.h"
 #include "Python.h"
+#include "cinderx/Interpreter/opcode.h"
 
 #include "cinderx/Jit/compiler.h"
 #include "cinderx/Jit/hir/builder.h"

diff --git a/cinderx/RuntimeTests/inline_cache_test.cpp b/cinderx/RuntimeTests/inline_cache_test.cpp
@@ -2,8 +2,8 @@
 #include <gtest/gtest.h>
 
 #include "Python.h"
-#include "cinderx/StrictModules/Objects/objects.h"
 #include "cinder/exports.h"
+#include "cinderx/StrictModules/Objects/objects.h"
 #include "unicodeobject.h"
 
 #include "cinderx/Jit/inline_cache.h"