Run clang-format on everything (bazelbuild#470)

tymurmustafaiev · Aug 11, 2020 · df70bcc · df70bcc
1 parent 42b52ce
commit df70bcc
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/examples/apple/objc_interop/OIPrintStream.h b/examples/apple/objc_interop/OIPrintStream.h
@@ -15,7 +15,7 @@
 #import <Foundation/Foundation.h>
 
 /** A very contrived interface for writing strings to a file handle. */
-@interface OIPrintStream: NSObject
+@interface OIPrintStream : NSObject
 
 - (nonnull instancetype)initWithFileHandle:(nonnull NSFileHandle *)fileHandle;
 

diff --git a/examples/xplatform/c_from_swift/c_counter.cc b/examples/xplatform/c_from_swift/c_counter.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "examples/xplatform/c_from_swift/c_counter.h"
+
 #include "examples/xplatform/c_from_swift/counter.h"
 
 using ::swiftexample::Counter;

diff --git a/tools/common/temp_file.h b/tools/common/temp_file.h
@@ -41,8 +41,8 @@ class TempFile {
     snprintf(path.get(), size, "%s/%s", tmpDir, path_template.c_str());
 
     if (mkstemp(path.get()) == -1) {
-      std::cerr << "Failed to create temporary file '" << path.get() << "': "
-                << strerror(errno) << "\n";
+      std::cerr << "Failed to create temporary file '" << path.get()
+                << "': " << strerror(errno) << "\n";
       return nullptr;
     }
     return std::unique_ptr<TempFile>(new TempFile(path.get()));

diff --git a/tools/worker/compile_with_worker.cc b/tools/worker/compile_with_worker.cc
@@ -14,12 +14,12 @@
 
 #include "tools/worker/compile_with_worker.h"
 
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/util/delimited_message_util.h>
 #include <unistd.h>
 
 #include <iostream>
 
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/util/delimited_message_util.h>
 #include "third_party/bazel_protos/worker_protocol.pb.h"
 #include "tools/worker/work_processor.h"
 

diff --git a/tools/worker/output_file_map.cc b/tools/worker/output_file_map.cc
@@ -17,10 +17,10 @@
 #include <fstream>
 #include <iostream>
 #include <map>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "tools/common/path_utils.h"
-#include <nlohmann/json.hpp>
 
 namespace {
 

diff --git a/tools/worker/output_file_map.h b/tools/worker/output_file_map.h
@@ -16,9 +16,8 @@
 #define BUILD_BAZEL_RULES_SWIFT_TOOLS_WORKER_OUTPUT_FILE_MAP_H
 
 #include <map>
-#include <string>
-
 #include <nlohmann/json.hpp>
+#include <string>
 
 // Supports loading and rewriting a `swiftc` output file map to support
 // incremental compilation.

diff --git a/tools/worker/work_processor.cc b/tools/worker/work_processor.cc
@@ -14,21 +14,21 @@
 
 #include "tools/worker/work_processor.h"
 
+#include <google/protobuf/text_format.h>
 #include <sys/stat.h>
 
 #include <fstream>
 #include <map>
+#include <nlohmann/json.hpp>
 #include <sstream>
 #include <string>
 
-#include <google/protobuf/text_format.h>
 #include "tools/common/file_system.h"
 #include "tools/common/path_utils.h"
 #include "tools/common/string_utils.h"
 #include "tools/common/temp_file.h"
 #include "tools/worker/output_file_map.h"
 #include "tools/worker/swift_runner.h"
-#include <nlohmann/json.hpp>
 
 namespace {