diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m index f424f51f878..841cdeee1b3 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m @@ -111,8 +111,8 @@ - (instancetype)initWithRequestSender:(FIRIAMClearcutHttpRequestSender *)request _userDefaults = userDefaults ? userDefaults : [GULUserDefaults standardUserDefaults]; // it would be 0 if it does not exist, which is equvilent to saying that // you can send now - _nextValidSendTimeInMills = (int64_t) - [_userDefaults doubleForKey:FIRIAM_UserDefaultsKeyForNextValidClearcutUploadTimeInMills]; + _nextValidSendTimeInMills = (int64_t)[_userDefaults + doubleForKey:FIRIAM_UserDefaultsKeyForNextValidClearcutUploadTimeInMills]; NSArray *availableLogs = [logStorage popStillValidRecordsForUpTo:strategy.batchSendSize]; diff --git a/Firestore/core/src/immutable/keys_view.h b/Firestore/core/src/immutable/keys_view.h index c866ba5ef6c..fad8510cd59 100644 --- a/Firestore/core/src/immutable/keys_view.h +++ b/Firestore/core/src/immutable/keys_view.h @@ -47,8 +47,8 @@ auto KeysView(const Range& range) -> KeysRange { } template -auto KeysViewFrom(const Range& range, - const K& key) -> KeysRange { +auto KeysViewFrom(const Range& range, const K& key) + -> KeysRange { auto keys_begin = util::make_iterator_first(range.lower_bound(key)); auto keys_end = util::make_iterator_first(std::end(range)); return util::make_range(keys_begin, keys_end); diff --git a/Firestore/core/src/util/filesystem_posix.cc b/Firestore/core/src/util/filesystem_posix.cc index 8688ce5897c..8a2058c0809 100644 --- a/Firestore/core/src/util/filesystem_posix.cc +++ b/Firestore/core/src/util/filesystem_posix.cc @@ -132,7 +132,7 @@ Path Filesystem::TempDir() { #if !__APPLE__ Status Filesystem::IsDirectory(const Path& path) { - struct stat buffer {}; + struct stat buffer{}; if (::stat(path.c_str(), &buffer)) { if (errno == ENOENT) { // Expected common error case. @@ -168,7 +168,7 @@ Status Filesystem::IsDirectory(const Path& path) { } StatusOr Filesystem::FileSize(const Path& path) { - struct stat st {}; + struct stat st{}; if (::stat(path.c_str(), &st) == 0) { return st.st_size; } else { diff --git a/Firestore/core/src/util/hashing.h b/Firestore/core/src/util/hashing.h index 33375f03a63..7286c44cc32 100644 --- a/Firestore/core/src/util/hashing.h +++ b/Firestore/core/src/util/hashing.h @@ -190,8 +190,8 @@ auto RankedInvokeHash(const Range& range, HashChoice<3>) * value can itself be hashed. */ template -auto RankedInvokeHash(const absl::optional& option, - HashChoice<4>) -> decltype(InvokeHash(*option)) { +auto RankedInvokeHash(const absl::optional& option, HashChoice<4>) + -> decltype(InvokeHash(*option)) { return option ? InvokeHash(*option) : -1171; } @@ -202,8 +202,8 @@ size_t RankedInvokeHash(K value, HashChoice<5>) { } template -auto RankedInvokeHash(const std::unique_ptr& ptr, - HashChoice<6>) -> decltype(InvokeHash(*ptr)) { +auto RankedInvokeHash(const std::unique_ptr& ptr, HashChoice<6>) + -> decltype(InvokeHash(*ptr)) { return ptr ? InvokeHash(*ptr) : 23631; } diff --git a/scripts/setup_check.sh b/scripts/setup_check.sh index eb323eb0473..a1e6ad64ecc 100755 --- a/scripts/setup_check.sh +++ b/scripts/setup_check.sh @@ -35,7 +35,7 @@ fi # install clang-format brew update -brew install clang-format@18 +brew install clang-format@19 # mint installs tools from Mintfile on demand. brew install mint diff --git a/scripts/style.sh b/scripts/style.sh index 324903331d2..5caf8e54296 100755 --- a/scripts/style.sh +++ b/scripts/style.sh @@ -56,7 +56,7 @@ version="${version/ (*)/}" version="${version/.*/}" case "$version" in - 18) + 19) ;; google3-trunk) echo "Please use a publicly released clang-format; a recent LLVM release"