Fix cpp formatter differences (#2773)

* Part of #2647 ### What For unknown reasons cpp formatter invoked via just file versus via codegen yielded slightly different results. Tried various things but to no avail. However, specifying some of the options in the clang format file more explicitely solves the issue. Plus, changed how header sorting is handled. ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/2773) (if applicable) - [PR Build Summary](https://build.rerun.io/pr/2773) - [Docs preview](https://rerun.io/preview/pr%3Aandreas%2Fcpp-codegen%2Ffix-formatter-differences/docs) - [Examples preview](https://rerun.io/preview/pr%3Aandreas%2Fcpp-codegen%2Ffix-formatter-differences/examples)
rerun-io · Jul 21, 2023 · 8baa1b6 · 8baa1b6
1 parent 90d8c39
commit 8baa1b6
Show file tree

Hide file tree

Showing 74 changed files with 189 additions and 154 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,7 @@
 BasedOnStyle: Google
 
 # Make it slightly more similar to Rust.
-# Based loosly on https://gist.github.com/YodaEmbedding/c2c77dc693d11f3734d78489f9a6eea4
+# Based loosely on https://gist.github.com/YodaEmbedding/c2c77dc693d11f3734d78489f9a6eea4
 AccessModifierOffset: -2
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
@@ -21,3 +21,9 @@ NamespaceIndentation: All
 PointerAlignment: Left
 SeparateDefinitionBlocks: Always
 SpacesBeforeTrailingComments: 1
+ReflowComments: true
+
+# Don't change include blocks, we want to control this manually.
+# Sorting headers however is allowed as all our headers should be standalone.
+IncludeBlocks: Preserve
+SortIncludes: CaseInsensitive
diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt
@@ -1,4 +1,8 @@
 # This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
 # It can be safely removed at anytime to force the build script to run again.
 # Check out build.rs to see how it's computed.
+<<<<<<< HEAD
+70102e74a219445db03e9e5d914687f1756e85b35d93e187dd3346d87b99f806
+=======
 b4f2c2b3b6518fd5c5b8fe2255952c6986895efe58cbc6ae0b56b0384a9ad930
+>>>>>>> origin/main
diff --git a/crates/re_types_builder/src/codegen/cpp/includes.rs b/crates/re_types_builder/src/codegen/cpp/includes.rs
@@ -28,11 +28,14 @@ impl quote::ToTokens for Includes {
             quote! { #hash include #name #NEWLINE_TOKEN }
         });
 
+        // Put the local includes first. This is less common but makes it easier for us to early detect
+        // when a header relies on some system includes being present.
+        // (all our headers should be standalone, i.e. don't assume something else was included before them)
         quote! {
-            #(#system)*
-            #NEWLINE_TOKEN
             #(#local)*
             #NEWLINE_TOKEN
+            #(#system)*
+            #NEWLINE_TOKEN
             #NEWLINE_TOKEN
         }
         .to_tokens(tokens);

diff --git a/rerun_cpp/src/archetypes/affix_fuzzer1.hpp b/rerun_cpp/src/archetypes/affix_fuzzer1.hpp
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <optional>
-#include <vector>
-
 #include "../components/affix_fuzzer1.hpp"
 #include "../components/affix_fuzzer10.hpp"
 #include "../components/affix_fuzzer11.hpp"
@@ -27,6 +23,10 @@
 #include "../components/affix_fuzzer8.hpp"
 #include "../components/affix_fuzzer9.hpp"
 
+#include <cstdint>
+#include <optional>
+#include <vector>
+
 namespace rr {
     namespace archetypes {
         struct AffixFuzzer1 {

diff --git a/rerun_cpp/src/archetypes/points2d.hpp b/rerun_cpp/src/archetypes/points2d.hpp
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <optional>
-#include <vector>
-
 #include "../components/class_id.hpp"
 #include "../components/color.hpp"
 #include "../components/draw_order.hpp"
@@ -16,6 +12,10 @@
 #include "../components/point2d.hpp"
 #include "../components/radius.hpp"
 
+#include <cstdint>
+#include <optional>
+#include <vector>
+
 namespace rr {
     namespace archetypes {
         /// A 2D point cloud with positions and optional colors, radii, labels, etc.

diff --git a/rerun_cpp/src/archetypes/transform3d.hpp b/rerun_cpp/src/archetypes/transform3d.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
+#include "../components/transform3d.hpp"
+
 #include <cstdint>
 #include <utility>
 
-#include "../components/transform3d.hpp"
-
 namespace rr {
     namespace archetypes {
         /// A 3D transform.

diff --git a/rerun_cpp/src/components/affix_fuzzer1.cpp b/rerun_cpp/src/components/affix_fuzzer1.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer1.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer1.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer1.hpp b/rerun_cpp/src/components/affix_fuzzer1.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer1.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <utility>
 
-#include "../datatypes/affix_fuzzer1.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer10.cpp b/rerun_cpp/src/components/affix_fuzzer10.cpp
@@ -1,10 +1,10 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
-
 #include "affix_fuzzer10.hpp"
 
+#include <arrow/api.h>
+
 namespace rr {
     namespace components {
         std::shared_ptr<arrow::DataType> AffixFuzzer10::to_arrow_datatype() {

diff --git a/rerun_cpp/src/components/affix_fuzzer11.cpp b/rerun_cpp/src/components/affix_fuzzer11.cpp
@@ -1,10 +1,10 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
-
 #include "affix_fuzzer11.hpp"
 
+#include <arrow/api.h>
+
 namespace rr {
     namespace components {
         std::shared_ptr<arrow::DataType> AffixFuzzer11::to_arrow_datatype() {

diff --git a/rerun_cpp/src/components/affix_fuzzer12.cpp b/rerun_cpp/src/components/affix_fuzzer12.cpp
@@ -1,10 +1,10 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
-
 #include "affix_fuzzer12.hpp"
 
+#include <arrow/api.h>
+
 namespace rr {
     namespace components {
         std::shared_ptr<arrow::DataType> AffixFuzzer12::to_arrow_datatype() {

diff --git a/rerun_cpp/src/components/affix_fuzzer13.cpp b/rerun_cpp/src/components/affix_fuzzer13.cpp
@@ -1,10 +1,10 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
-
 #include "affix_fuzzer13.hpp"
 
+#include <arrow/api.h>
+
 namespace rr {
     namespace components {
         std::shared_ptr<arrow::DataType> AffixFuzzer13::to_arrow_datatype() {

diff --git a/rerun_cpp/src/components/affix_fuzzer14.cpp b/rerun_cpp/src/components/affix_fuzzer14.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer14.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer14.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer14.hpp b/rerun_cpp/src/components/affix_fuzzer14.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer3.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <utility>
 
-#include "../datatypes/affix_fuzzer3.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer15.cpp b/rerun_cpp/src/components/affix_fuzzer15.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer15.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer15.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer15.hpp b/rerun_cpp/src/components/affix_fuzzer15.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer3.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <utility>
 
-#include "../datatypes/affix_fuzzer3.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer16.cpp b/rerun_cpp/src/components/affix_fuzzer16.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer16.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer16.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer16.hpp b/rerun_cpp/src/components/affix_fuzzer16.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer3.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "../datatypes/affix_fuzzer3.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer17.cpp b/rerun_cpp/src/components/affix_fuzzer17.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer17.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer17.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer17.hpp b/rerun_cpp/src/components/affix_fuzzer17.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer3.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <utility>
 #include <vector>
 
-#include "../datatypes/affix_fuzzer3.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer18.cpp b/rerun_cpp/src/components/affix_fuzzer18.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer18.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer18.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer18.hpp b/rerun_cpp/src/components/affix_fuzzer18.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer4.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <utility>
 #include <vector>
 
-#include "../datatypes/affix_fuzzer4.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer19.cpp b/rerun_cpp/src/components/affix_fuzzer19.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer19.hpp"
 
 #include "../datatypes/affix_fuzzer5.hpp"
-#include "affix_fuzzer19.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer19.hpp b/rerun_cpp/src/components/affix_fuzzer19.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer5.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <utility>
 
-#include "../datatypes/affix_fuzzer5.hpp"
-
 namespace arrow {
     class DataType;
 }

diff --git a/rerun_cpp/src/components/affix_fuzzer2.cpp b/rerun_cpp/src/components/affix_fuzzer2.cpp
@@ -1,10 +1,11 @@
 // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT.
 // Based on "crates/re_types/definitions/rerun/testing/components/fuzzy.fbs"
 
-#include <arrow/api.h>
+#include "affix_fuzzer2.hpp"
 
 #include "../datatypes/affix_fuzzer1.hpp"
-#include "affix_fuzzer2.hpp"
+
+#include <arrow/api.h>
 
 namespace rr {
     namespace components {

diff --git a/rerun_cpp/src/components/affix_fuzzer2.hpp b/rerun_cpp/src/components/affix_fuzzer2.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "../datatypes/affix_fuzzer1.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <utility>
 
-#include "../datatypes/affix_fuzzer1.hpp"
-
 namespace arrow {
     class DataType;
 }