Upgrade clang-format (#5265)

Co-authored-by: Marek Gilbert <mcg@google.com>

.clang-format

@@ -6,3 +6,4 @@ ObjCSpaceBeforeProtocolList: true
 SpacesInContainerLiterals: true
 PointerAlignment: Right
 AllowShortFunctionsOnASingleLine: None
+IncludeBlocks: Preserve

Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h

@@ -14,13 +14,13 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "FIRCLSFeatures.h"
 #include "FIRCLSFile.h"
 #include "FIRCLSMachO.h"
 
-#include <stdbool.h>
-#include <stdint.h>
-
 __BEGIN_DECLS
 
 // Typically, apps seem to have ~300 binary images loaded

Crashlytics/Crashlytics/Components/FIRCLSHost.h

@@ -14,11 +14,11 @@
 
 #pragma once
 
-#include "FIRCLSFile.h"
-
 #include <mach/vm_types.h>
 #include <sys/cdefs.h>
 
+#include "FIRCLSFile.h"
+
 typedef struct {
   const char* documentDirectoryPath;
   vm_size_t pageSize;

Crashlytics/Crashlytics/Components/FIRCLSProcess.h

@@ -14,11 +14,11 @@
 
 #pragma once
 
-#include "FIRCLSFile.h"
-
 #include <mach/mach.h>
 #include <stdbool.h>
 
+#include "FIRCLSFile.h"
+
 typedef struct {
   // task info
   mach_port_t task;

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h

@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include "FIRCLSFile.h"
-
 #include <mach/mach.h>
 
+#include "FIRCLSFile.h"
+
 __BEGIN_DECLS
 
 void FIRCLSHandler(FIRCLSFile* file, thread_t crashedThread, void* uapVoid);

Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.h

@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "FIRCLSFeatures.h"
-#include "FIRCLSThreadState.h"
-
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "FIRCLSFeatures.h"
+#include "FIRCLSThreadState.h"
+
 // We have to pack the arrays defined in this header, so
 // we can reason about pointer math.
 #pragma pack(push)

Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.h

@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include "FIRCLSFeatures.h"
-
 #include <stdint.h>
 
+#include "FIRCLSFeatures.h"
+
 #if CLS_DWARF_UNWINDING_SUPPORTED
 
 #if CLS_CPU_64BIT

Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.h

@@ -14,13 +14,13 @@
 
 #pragma once
 
-#include "FIRCLSDwarfUnwindRegisters.h"
-#include "FIRCLSThreadState.h"
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "FIRCLSDwarfUnwindRegisters.h"
+#include "FIRCLSThreadState.h"
+
 #if CLS_DWARF_UNWINDING_SUPPORTED
 
 #pragma mark Structures

Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h

@@ -19,11 +19,11 @@
 #if CLS_COMPACT_UNWINDING_SUPPORTED
 #include "FIRCLSCompactUnwind.h"
 #endif
-#include "FIRCLSUnwind_arch.h"
-
 #include <mach/vm_types.h>
 #include <stdbool.h>
 
+#include "FIRCLSUnwind_arch.h"
+
 extern const uint32_t FIRCLSUnwindMaxFrames;
 
 extern const uint32_t FIRCLSUnwindInfiniteRecursionCountThreshold;

Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arch.h

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "FIRCLSFeatures.h"
-
 #include "FIRCLSThreadState.h"
 #if CLS_COMPACT_UNWINDING_SUPPORTED
 #include "FIRCLSCompactUnwind.h"

Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestFieldPath.h

@@ -18,6 +18,7 @@
 #define FIRESTORE_EXAMPLE_FUZZTESTS_FUZZINGTARGETS_FSTFUZZTESTFIELDPATH_H_
 
 #import <Foundation/Foundation.h>
+
 #include <string>
 
 namespace firebase {

Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestSerializer.h

@@ -18,6 +18,7 @@
 #define FIRESTORE_EXAMPLE_FUZZTESTS_FUZZINGTARGETS_FSTFUZZTESTSERIALIZER_H_
 
 #import <Foundation/Foundation.h>
+
 #include <string>
 
 namespace firebase {

Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm

@@ -1227,7 +1227,7 @@ using firebase::firestore::util::TimerId;
   FIRFirestore *firestore = doc.firestore;
 
   [self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
-  [firestore workerQueue] -> RunScheduledOperationsUntil(TimerId::WriteStreamIdle);
+  [firestore workerQueue]->RunScheduledOperationsUntil(TimerId::WriteStreamIdle);
   [self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
 }
 
@@ -1236,7 +1236,7 @@ using firebase::firestore::util::TimerId;
   FIRFirestore *firestore = doc.firestore;
 
   [self readSnapshotForRef:[self documentRef] requireOnline:YES];
-  [firestore workerQueue] -> RunScheduledOperationsUntil(TimerId::ListenStreamIdle);
+  [firestore workerQueue]->RunScheduledOperationsUntil(TimerId::ListenStreamIdle);
   [self readSnapshotForRef:[self documentRef] requireOnline:YES];
 }
 

Firestore/Example/Tests/Integration/FSTTransactionTests.mm

@@ -398,7 +398,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc)
   [self writeDocumentRef:doc data:@{@"count" : @(5.0)}];
 
   // Skip backoff delays.
-  [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction);
+  [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction);
 
   // Make 3 transactions that will all increment.
   int total = 3;
@@ -443,7 +443,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc)
   [self writeDocumentRef:doc data:@{@"count" : @(5.0), @"other" : @"yes"}];
 
   // Skip backoff delays.
-  [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction);
+  [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction);
 
   // Make 3 transactions that will all increment.
   int total = 3;
@@ -492,7 +492,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc)
   [self writeDocumentRef:doc1 data:@{@"count" : @(15.0)}];
 
   // Skip backoff delays.
-  [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction);
+  [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction);
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"transaction"];
   [firestore
@@ -537,7 +537,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc)
   [self writeDocumentRef:doc data:@{@"count" : @(15.0)}];
 
   // Skip backoff delays.
-  [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction);
+  [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction);
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"transaction"];
   [firestore

Firestore/core/.clang-format

@@ -7,3 +7,4 @@ SpacesInContainerLiterals: true
 DerivePointerAlignment: false
 PointerAlignment: Left
 AllowShortFunctionsOnASingleLine: None
+IncludeBlocks: Preserve

Firestore/core/src/firebase/firestore/core/event_manager.cc

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/core/event_manager.h"
+
 #include <utility>
 
-#include "Firestore/core/src/firebase/firestore/core/event_manager.h"
 #include "Firestore/core/src/firebase/firestore/core/query_listener.h"
 #include "Firestore/core/src/firebase/firestore/core/sync_engine.h"
 #include "Firestore/core/src/firebase/firestore/util/hard_assert.h"

Firestore/core/src/firebase/firestore/core/target_id_generator.cc

@@ -15,6 +15,7 @@
  */
 
 #include "Firestore/core/src/firebase/firestore/core/target_id_generator.h"
+
 #include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 
 using firebase::firestore::model::TargetId;

Firestore/core/src/firebase/firestore/core/transaction_runner.cc

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/core/transaction_runner.h"
+
 #include <utility>
 
-#include "Firestore/core/src/firebase/firestore/core/transaction_runner.h"
 #include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h"
 #include "absl/algorithm/container.h"
 

Firestore/core/src/firebase/firestore/local/index_free_query_engine.h

@@ -18,7 +18,6 @@
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_LOCAL_INDEX_FREE_QUERY_ENGINE_H_
 
 #include "Firestore/core/src/firebase/firestore/local/query_engine.h"
-
 #include "Firestore/core/src/firebase/firestore/model/model_fwd.h"
 
 namespace firebase {

Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.cc

@@ -21,7 +21,6 @@
 #include <utility>
 
 #include "Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h"
-
 #include "Firestore/core/src/firebase/firestore/core/query.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h"

Firestore/core/src/firebase/firestore/remote/grpc_connection.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Firestore/core/src/firebase/firestore/util/warnings.h"
-
 #include "Firestore/core/src/firebase/firestore/auth/token.h"
 #include "Firestore/core/src/firebase/firestore/core/database_info.h"
 #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h"
@@ -33,10 +31,12 @@
 #include "Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h"
 #include "Firestore/core/src/firebase/firestore/util/path.h"
+#include "Firestore/core/src/firebase/firestore/util/warnings.h"
 #include "absl/strings/string_view.h"
 #include "grpcpp/channel.h"
 #include "grpcpp/client_context.h"
 #include "grpcpp/completion_queue.h"
+
 SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN()
 #include "grpcpp/generic/generic_stub.h"
 SUPPRESS_END()

Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.cc

@@ -1,9 +1,9 @@
 // Copyright 2019 Google Inc. All Rights Reserved.
 
-#include <cstdlib>
-
 #include "Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.h"
 
+#include <cstdlib>
+
 namespace firebase {
 namespace firestore {
 namespace remote {

Firestore/core/src/firebase/firestore/remote/grpc_stream.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,19 +25,19 @@
 #include <utility>
 #include <vector>
 
-#include "Firestore/core/src/firebase/firestore/util/warnings.h"
-
 #include "Firestore/core/src/firebase/firestore/remote/grpc_call.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_stream_observer.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/status_fwd.h"
+#include "Firestore/core/src/firebase/firestore/util/warnings.h"
 #include "absl/types/optional.h"
 #include "grpcpp/client_context.h"
+#include "grpcpp/support/byte_buffer.h"
+
 SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN()
 #include "grpcpp/generic/generic_stub.h"
 SUPPRESS_END()
-#include "grpcpp/support/byte_buffer.h"
 
 namespace firebase {
 namespace firestore {

Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,16 @@
 #include <memory>
 #include <vector>
 
-#include "Firestore/core/src/firebase/firestore/util/warnings.h"
-
 #include "Firestore/core/src/firebase/firestore/remote/grpc_stream.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_stream_observer.h"
 #include "Firestore/core/src/firebase/firestore/util/status_fwd.h"
+#include "Firestore/core/src/firebase/firestore/util/warnings.h"
 #include "grpcpp/client_context.h"
+#include "grpcpp/support/byte_buffer.h"
+
 SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN()
 #include "grpcpp/generic/generic_stub.h"
 SUPPRESS_END()
-#include "grpcpp/support/byte_buffer.h"
 
 namespace firebase {
 namespace firestore {

Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,17 @@
 #include <map>
 #include <memory>
 
-#include "Firestore/core/src/firebase/firestore/util/warnings.h"
-
 #include "Firestore/core/src/firebase/firestore/remote/grpc_call.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/status_fwd.h"
+#include "Firestore/core/src/firebase/firestore/util/warnings.h"
 #include "grpcpp/client_context.h"
+#include "grpcpp/support/byte_buffer.h"
+
 SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN()
 #include "grpcpp/generic/generic_stub.h"
 SUPPRESS_END()
-#include "grpcpp/support/byte_buffer.h"
 
 namespace firebase {
 namespace firestore {

Firestore/core/src/firebase/firestore/remote/watch_stream.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <utility>
-
 #include "Firestore/core/src/firebase/firestore/remote/watch_stream.h"
 
+#include <utility>
+
 #include "Firestore/core/src/firebase/firestore/model/mutation.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/message.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/reader.h"

Firestore/core/src/firebase/firestore/remote/write_stream.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <utility>
-
 #include "Firestore/core/src/firebase/firestore/remote/write_stream.h"
 
+#include <utility>
+
 #include "Firestore/core/src/firebase/firestore/model/mutation.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/message.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/reader.h"

Firestore/core/src/firebase/firestore/util/secure_random.h

@@ -18,7 +18,6 @@
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_SECURE_RANDOM_H_
 
 #include <cstdint>
-
 #include <limits>
 
 namespace firebase {

Firestore/core/src/firebase/firestore/util/statusor.cc

@@ -15,6 +15,7 @@
  */
 
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
+
 #include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/core/field_filter_test.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/src/firebase/firestore/core/filter.h"
-
 #include "Firestore/core/src/firebase/firestore/core/field_filter.h"
+
+#include "Firestore/core/src/firebase/firestore/core/filter.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/core/query_listener_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/core/query_listener.h"
+
 #include <future>  // NOLINT(build/c++11)
 #include <memory>
 #include <utility>
@@ -22,7 +24,6 @@
 #include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 #include "Firestore/core/src/firebase/firestore/core/event_listener.h"
 #include "Firestore/core/src/firebase/firestore/core/listen_options.h"
-#include "Firestore/core/src/firebase/firestore/core/query_listener.h"
 #include "Firestore/core/src/firebase/firestore/core/view.h"
 #include "Firestore/core/src/firebase/firestore/core/view_snapshot.h"
 #include "Firestore/core/src/firebase/firestore/model/document_set.h"

Firestore/core/test/firebase/firestore/core/view_snapshot_test.cc

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/core/view_snapshot.h"
+
 #include <vector>
 
-#include "Firestore/core/src/firebase/firestore/core/view_snapshot.h"
 #include "Firestore/core/src/firebase/firestore/model/document_set.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
 #include "gtest/gtest.h"

Firestore/core/test/firebase/firestore/core/view_test.cc

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/core/view.h"
+
 #include <initializer_list>
 #include <utility>
 #include <vector>
 
 #include "Firestore/core/src/firebase/firestore/core/field_filter.h"
 #include "Firestore/core/src/firebase/firestore/core/filter.h"
-#include "Firestore/core/src/firebase/firestore/core/view.h"
 #include "Firestore/core/src/firebase/firestore/core/view_snapshot.h"
 #include "Firestore/core/src/firebase/firestore/model/document_key_set.h"
 #include "Firestore/core/src/firebase/firestore/model/document_set.h"

Firestore/core/test/firebase/firestore/immutable/array_sorted_map_test.cc

@@ -21,7 +21,6 @@
 #include <random>
 
 #include "Firestore/core/src/firebase/firestore/util/secure_random.h"
-
 #include "Firestore/core/test/firebase/firestore/immutable/testing.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc

@@ -32,7 +32,6 @@
 #include "Firestore/core/src/firebase/firestore/immutable/array_sorted_map.h"
 #include "Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h"
 #include "Firestore/core/src/firebase/firestore/util/secure_random.h"
-
 #include "Firestore/core/test/firebase/firestore/immutable/testing.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/local/leveldb_key_test.cc

@@ -15,6 +15,7 @@
  */
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
+
 #include "Firestore/core/src/firebase/firestore/model/maybe_document.h"
 #include "Firestore/core/src/firebase/firestore/util/string_util.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"

Firestore/core/test/firebase/firestore/local/leveldb_migrations_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h"
+
 #include <map>
 #include <memory>
 #include <string>
@@ -21,7 +23,6 @@
 
 #include "Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
-#include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_target_cache.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/message.h"
 #include "Firestore/core/src/firebase/firestore/util/ordered_code.h"

Firestore/core/test/firebase/firestore/local/leveldb_mutation_queue_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.h"
+
 #include <string>
 #include <vector>
 
@@ -21,7 +23,6 @@
 #include "Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h"
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
-#include "Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h"
 #include "Firestore/core/src/firebase/firestore/local/reference_set.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/byte_string.h"

Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.h"
+
 #include <initializer_list>
 #include <memory>
 #include <string>
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h"
-#include "Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.h"
 #include "Firestore/core/src/firebase/firestore/local/remote_document_cache.h"
 #include "Firestore/core/src/firebase/firestore/util/ordered_code.h"
 #include "Firestore/core/test/firebase/firestore/local/persistence_testing.h"

Firestore/core/test/firebase/firestore/local/leveldb_target_cache_test.cc

@@ -15,6 +15,7 @@
  */
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_target_cache.h"
+
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h"
 #include "Firestore/core/src/firebase/firestore/local/persistence.h"

Firestore/core/test/firebase/firestore/local/leveldb_util_test.cc

@@ -15,8 +15,8 @@
  */
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_util.h"
-#include "Firestore/core/src/firebase/firestore/util/status.h"
 
+#include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "gtest/gtest.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/local/memory_remote_document_cache.h"
+
 #include <memory>
 
 #include "Firestore/core/src/firebase/firestore/local/memory_persistence.h"
-#include "Firestore/core/src/firebase/firestore/local/memory_remote_document_cache.h"
 #include "Firestore/core/src/firebase/firestore/local/reference_delegate.h"
 #include "Firestore/core/src/firebase/firestore/local/remote_document_cache.h"
 #include "Firestore/core/test/firebase/firestore/local/persistence_testing.h"

Firestore/core/test/firebase/firestore/local/reference_set_test.cc

@@ -18,7 +18,6 @@
 
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
-
 #include "gtest/gtest.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/model/document_key_test.cc

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/model/document_key.h"
+
 #include <initializer_list>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "Firestore/core/src/firebase/firestore/model/document_key.h"
 #include "Firestore/core/src/firebase/firestore/model/resource_path.h"
 #include "Firestore/core/src/firebase/firestore/util/comparison.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"

Firestore/core/test/firebase/firestore/model/document_test.cc

@@ -20,7 +20,6 @@
 #include "Firestore/core/src/firebase/firestore/model/field_value.h"
 #include "Firestore/core/src/firebase/firestore/model/unknown_document.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
-
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/model/no_document_test.cc

@@ -17,7 +17,6 @@
 #include "Firestore/core/src/firebase/firestore/model/no_document.h"
 
 #include "Firestore/core/src/firebase/firestore/model/unknown_document.h"
-
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/model/precondition_test.cc

@@ -20,7 +20,6 @@
 #include "Firestore/core/src/firebase/firestore/model/no_document.h"
 #include "Firestore/core/src/firebase/firestore/model/snapshot_version.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
-
 #include "gtest/gtest.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/nanopb/message_test.cc

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/nanopb/message.h"
+
 #include <cstdint>
 #include <utility>
 #include <vector>
 
 #include "Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h"
-#include "Firestore/core/src/firebase/firestore/nanopb/message.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/nanopb_util.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/writer.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_nanopb.h"

Firestore/core/test/firebase/firestore/remote/datastore_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/datastore.h"
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -23,7 +25,6 @@
 #include "Firestore/core/src/firebase/firestore/model/mutation.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/message.h"
 #include "Firestore/core/src/firebase/firestore/nanopb/nanopb_util.h"
-#include "Firestore/core/src/firebase/firestore/remote/datastore.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_nanopb.h"
 #include "Firestore/core/src/firebase/firestore/remote/serializer.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"

Firestore/core/test/firebase/firestore/remote/exponential_backoff_test.cc

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h"
+
 #include <chrono>  // NOLINT(build/c++11)
 
-#include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/executor.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"

Firestore/core/test/firebase/firestore/remote/grpc_connection_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h"
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -21,7 +23,6 @@
 
 #include "Firestore/core/src/firebase/firestore/auth/token.h"
 #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h"
-#include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"

Firestore/core/test/firebase/firestore/remote/grpc_unary_call_test.cc

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h"
+
 #include <initializer_list>
 #include <memory>
 
 #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h"
-#include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"

Firestore/core/test/firebase/firestore/remote/remote_event_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/remote_event.h"
+
 #include <memory>
 #include <unordered_map>
 #include <utility>
@@ -24,7 +26,6 @@
 #include "Firestore/core/src/firebase/firestore/model/no_document.h"
 #include "Firestore/core/src/firebase/firestore/model/types.h"
 #include "Firestore/core/src/firebase/firestore/remote/existence_filter.h"
-#include "Firestore/core/src/firebase/firestore/remote/remote_event.h"
 #include "Firestore/core/src/firebase/firestore/remote/watch_change.h"
 #include "Firestore/core/test/firebase/firestore/remote/fake_target_metadata_provider.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"

Firestore/core/test/firebase/firestore/remote/serializer_test.cc

@@ -29,6 +29,7 @@
 
 #include <pb.h>
 #include <pb_encode.h>
+
 #include <functional>
 #include <limits>
 #include <utility>

Firestore/core/test/firebase/firestore/remote/stream_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/remote/stream.h"
+
 #include <initializer_list>
 #include <memory>
 #include <string>
@@ -24,7 +26,6 @@
 #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h"
 #include "Firestore/core/src/firebase/firestore/remote/grpc_stream.h"
-#include "Firestore/core/src/firebase/firestore/remote/stream.h"
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
 #include "Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h"

Firestore/core/test/firebase/firestore/testutil/status_testing.h

@@ -19,7 +19,6 @@
 
 #include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 #include "Firestore/core/src/firebase/firestore/util/status_fwd.h"
-
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/util/async_queue_test.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 #ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_ASYNC_QUEUE_TEST_H_
 #define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_ASYNC_QUEUE_TEST_H_
 
-#include <memory>
+#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 
-#include "gtest/gtest.h"
+#include <memory>
 
-#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
+#include "gtest/gtest.h"
 
 namespace firebase {
 namespace firestore {

Firestore/core/test/firebase/firestore/util/executor_std_test.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/test/firebase/firestore/util/executor_test.h"
+#include "Firestore/core/src/firebase/firestore/util/executor_std.h"
 
 #include <chrono>  // NOLINT(build/c++11)
 #include <cstdlib>
@@ -22,9 +22,9 @@
 #include <string>
 #include <thread>  // NOLINT(build/c++11)
 
-#include "Firestore/core/src/firebase/firestore/util/executor_std.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
 #include "Firestore/core/test/firebase/firestore/testutil/time_testing.h"
+#include "Firestore/core/test/firebase/firestore/util/executor_test.h"
 #include "absl/memory/memory.h"
 #include "gtest/gtest.h"
 

Firestore/core/test/firebase/firestore/util/executor_test.h

@@ -19,10 +19,9 @@
 
 #include <memory>
 
-#include "gtest/gtest.h"
-
 #include "Firestore/core/src/firebase/firestore/util/executor.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
+#include "gtest/gtest.h"
 
 namespace firebase {
 namespace firestore {

Firestore/core/test/firebase/firestore/util/hard_assert_test.cc

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
+
 #include <exception>
 
-#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 #include "gtest/gtest.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/util/statusor_test.cc

@@ -17,6 +17,7 @@
 // Unit tests for StatusOr
 
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
+
 #include "gtest/gtest.h"
 
 namespace firebase {

Firestore/core/test/firebase/firestore/util/to_string_test.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "Firestore/core/src/firebase/firestore/util/to_string.h"
+
 #include <deque>
 #include <map>
 #include <set>
@@ -25,9 +27,7 @@
 #include "Firestore/core/src/firebase/firestore/immutable/sorted_map.h"
 #include "Firestore/core/src/firebase/firestore/immutable/sorted_set.h"
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
-#include "Firestore/core/src/firebase/firestore/util/to_string.h"
 #include "absl/types/optional.h"
-
 #include "gtest/gtest.h"
 
 namespace firebase {

README.md

@@ -123,7 +123,7 @@ Travis will verify that any code changes are done in a style compliant way. Inst
 These commands will get the right versions:
 
 ```
-brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb
 brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb
 ```
 

scripts/binary_to_array.py

@@ -159,9 +159,9 @@ def source(namespaces, array_name, array_size_name, fileid, filename,
   data.extend([
       "// Copyright 2019 Google Inc. All Rights Reserved.",
       "",
-      "#include <cstdlib>",
-      "",
       "#include \"%s\"" % include_name,
+      "",
+      "#include <cstdlib>",
       ""
   ])
   if namespaces:

scripts/setup_check.sh

@@ -21,7 +21,7 @@ set -euo pipefail
 export HOMEBREW_NO_ANALYTICS=1
 export HOMEBREW_NO_AUTO_UPDATE=1
 
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb
 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb
 
 pip install flake8

scripts/style.sh

@@ -39,7 +39,7 @@ version="${version/ (*)/}"
 version="${version/.*/}"
 
 case "$version" in
-  8)
+  9)
     ;;
   google3-trunk)
     echo "Please use a publicly released clang-format; a recent LLVM release"
@@ -48,9 +48,9 @@ case "$version" in
     exit 1
     ;;
   *)
-    echo "Please upgrade to clang-format version 8."
+    echo "Please upgrade to clang-format version 9."
     echo "If it's installed via homebrew you can run:"
-    echo "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb"
+    echo "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb"
     exit 1
     ;;
 esac
@@ -67,8 +67,8 @@ if [[ "$system" == "Darwin" ]]; then
   # travis runs 0.35.7. We may need to be more strict about version checks in
   # the future if we run into different versions making incompatible format
   # changes.
-  if [[ ! "$version" =~ ^0.3[5-9] && ! "$version" =~ ^0.[4-9] ]]; then
-    echo "Version $version installed. Please upgrade to at least swiftformat 0.35.0"
+  if [[ ! "$version" =~ ^0.[4-9] ]]; then
+    echo "Version $version installed. Please upgrade to at least swiftformat 0.44.6"
     echo "If it's installed via homebrew you can run: brew upgrade swiftformat"
     exit 1
   fi