Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run clang-format on everything #470

Merged
merged 1 commit into from
Aug 11, 2020
+10 −10
Merged

Run clang-format on everything #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/apple/objc_interop/OIPrintStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions examples/xplatform/c_from_swift/c_counter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tools/common/temp_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
4 changes: 2 additions & 2 deletions tools/worker/compile_with_worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tools/worker/output_file_map.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 1 addition & 2 deletions tools/worker/output_file_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tools/worker/work_processor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down