Skip to content

Commit e35b4c7

Browse files
committed
We want stable/2018-08-24 not stable/2018-10-04 to match travis
1 parent 3da5773 commit e35b4c7

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Firestore/core/src/firebase/firestore/model/field_value.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,7 @@ void FieldValue::SwitchTo(const Type type) {
466466
case Type::Object:
467467
object_value_.internal_value.~map();
468468
break;
469-
default: {
470-
} // The other types where there is nothing to worry about.
469+
default: {} // The other types where there is nothing to worry about.
471470
}
472471
tag_ = type;
473472
// Must call constructor explicitly for any non-POD type to initialize.
@@ -498,8 +497,7 @@ void FieldValue::SwitchTo(const Type type) {
498497
case Type::Object:
499498
new (&object_value_) ObjectValue{};
500499
break;
501-
default: {
502-
} // The other types where there is nothing to worry about.
500+
default: {} // The other types where there is nothing to worry about.
503501
}
504502
}
505503

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Travis will verify that any code changes are done in a style compliant way. Inst
9090
`clang-format` and `swiftformat`.
9191
This command will get the right `clang-format` version:
9292

93-
`brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c435aae81df87d826eed0158ffdbfa872a7cb1b7/Formula/clang-format.rb`
93+
`brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/773cb75d360b58f32048f5964038d09825a507c8/Formula/clang-format.rb`
9494

9595
### Running Unit Tests
9696

scripts/style.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ case "$version" in
4949
;;
5050
*)
5151
echo "Please upgrade to clang-format version 8."
52-
echo "If it's installed via homebrew you can run: brew upgrade clang-format"
52+
echo "If it's installed via homebrew you can run:"
53+
echo "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/773cb75d360b58f32048f5964038d09825a507c8/Formula/clang-format.rb"
5354
exit 1
5455
;;
5556
esac

0 commit comments

Comments
 (0)