commit f74c149b9bc6be2158f1031fb4c5e6b9088ff0eb
author Michael Forster <forster@google.com> Fri Sep 17 09:30:10 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 21:52:59 2022 +0000
tree 71046a390a07e5f0fc1527df33405a653baa25a7
parent dc683af430b74e5927bf1d860effcff6c6a6bc95

Automatically format generated C++ bindings using clang-format.

PiperOrigin-RevId: 397274947

rs_bindings_from_cc/src_code_gen.cc

diff --git a/rs_bindings_from_cc/src_code_gen.cc b/rs_bindings_from_cc/src_code_gen.cc
index 86dbd85..35cc9ef 100644
--- a/rs_bindings_from_cc/src_code_gen.cc
+++ b/rs_bindings_from_cc/src_code_gen.cc
@@ -9,6 +9,7 @@
 #include "rs_bindings_from_cc/ffi_types.h"
 #include "rs_bindings_from_cc/ir.h"
 #include "third_party/json/src/json.hpp"
+#include "third_party/llvm/llvm-project/clang/include/clang/Format/Format.h"
 
 namespace rs_bindings_from_cc {
 
@@ -29,7 +30,13 @@
   const FfiU8SliceBox& rs_api_impl = ffi_bindings.rs_api_impl;
 
   bindings.rs_api = std::string(rs_api.ptr, rs_api.size);
-  bindings.rs_api_impl = std::string(rs_api_impl.ptr, rs_api_impl.size);
+
+  std::string impl{rs_api_impl.ptr, rs_api_impl.size};
+  bindings.rs_api_impl = *clang::tooling::applyAllReplacements(
+      impl,
+      clang::format::reformat(
+          clang::format::getGoogleStyle(clang::format::FormatStyle::LK_Cpp),
+          impl, clang::tooling::Range(0, impl.size()), "<stdin>"));
 
   return bindings;
 }

rs_bindings_from_cc/src_code_gen_test.cc

diff --git a/rs_bindings_from_cc/src_code_gen_test.cc b/rs_bindings_from_cc/src_code_gen_test.cc
index 5eca88e..cd782f2 100644
--- a/rs_bindings_from_cc/src_code_gen_test.cc
+++ b/rs_bindings_from_cc/src_code_gen_test.cc
@@ -40,15 +40,11 @@
           "} "
           "}"));
 
-  EXPECT_THAT(
-      // TODO(hlopko): Run generated C++ sources through clang-format.
-      bindings.rs_api_impl,
-      StrEq(
-          // TODO(hlopko): Run generated C++ sources through clang-format.
-          "# include \"foo/bar.h\" \n "
-          "extern \"C\" int __rust_thunk__hello_world (int arg) { "
-          "return hello_world (arg) ; "
-          "}"));
+  EXPECT_THAT(bindings.rs_api_impl,
+              StrEq("#include \"foo/bar.h\"\n"
+                    "extern \"C\" int __rust_thunk__hello_world(int arg) { "
+                    "return hello_world(arg); "
+                    "}"));
 }
 
 }  // namespace