SERVER-41772 Apply clang-format 7.0.1 to the codebase

7 files changed, 143 insertions, 355 deletions

diff --git a/src/mongo/db/query/collation/collation_index_key.cpp b/src/mongo/db/query/collation/collation_index_key.cpp
index 48d971d3f7e..44b647044ca 100644
--- a/src/mongo/db/query/collation/collation_index_key.cpp
+++ b/src/mongo/db/query/collation/collation_index_key.cpp
@@ -114,9 +114,7 @@ void translateElement(StringData fieldName,
             uasserted(ErrorCodes::CannotBuildIndexKeys,
                       str::stream()
                           << "Cannot index type Symbol with a collation. Failed to index element: "
-                          << element
-                          << ". Index collation: "
-                          << collator->getSpec().toBSON());
+                          << element << ". Index collation: " << collator->getSpec().toBSON());
         }
         default:
             out->appendAs(element, fieldName);
@@ -144,7 +142,7 @@ void translate(BSONObj obj, const CollatorInterface* collator, BufBuilder* out)
             element.fieldNameStringData(), element, collator, &ctx.getBuilder(), &ctxStack);
     }
 }
-}
+}  // namespace
 
 void CollationIndexKey::collationAwareIndexKeyAppend(BSONElement elt,
                                                      const CollatorInterface* collator,
diff --git a/src/mongo/db/query/collation/collation_index_key_test.cpp b/src/mongo/db/query/collation/collation_index_key_test.cpp
index 7696561060a..20a788d7df4 100644
--- a/src/mongo/db/query/collation/collation_index_key_test.cpp
+++ b/src/mongo/db/query/collation/collation_index_key_test.cpp
@@ -171,8 +171,7 @@ TEST(CollationIndexKeyTest, CollationAwareAppendThrowsIfSymbolInsideObject) {
     CollatorInterfaceMock collator(CollatorInterfaceMock::MockType::kReverseString);
     BSONObj dataObj = BSON("" << BSON("a"
                                       << "foo"
-                                      << "b"
-                                      << BSONSymbol("mySymbol")));
+                                      << "b" << BSONSymbol("mySymbol")));
     BSONObjBuilder out;
     ASSERT_THROWS_CODE(
         CollationIndexKey::collationAwareIndexKeyAppend(dataObj.firstElement(), &collator, &out),
diff --git a/src/mongo/db/query/collation/collation_spec_test.cpp b/src/mongo/db/query/collation/collation_spec_test.cpp
index 8036e463a54..c255476292e 100644
--- a/src/mongo/db/query/collation/collation_spec_test.cpp
+++ b/src/mongo/db/query/collation/collation_spec_test.cpp
@@ -185,23 +185,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesDefaults) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 3
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 3 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -215,23 +205,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesCaseFirstUpper) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "upper"
-                               << "strength"
-                               << 3
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 3 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -245,23 +225,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesCaseFirstLower) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "lower"
-                               << "strength"
-                               << 3
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 3 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -275,23 +245,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesPrimaryStrength) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 1
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 1 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -305,23 +265,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesSecondaryStrength) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 2
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 2 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -335,23 +285,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesQuaternaryStrength) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 4
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 4 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -365,23 +305,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesIdenticalStrength) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 5
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 5 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -395,23 +325,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesAlternateShifted) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 3
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 3 << "numericOrdering" << false << "alternate"
                                << "shifted"
                                << "maxVariable"
                                << "punct"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
@@ -425,23 +345,13 @@ TEST(CollationSpecTest, ToBSONCorrectlySerializesMaxVariableSpace) {
 
     BSONObj expectedObj = BSON("locale"
                                << "myLocale"
-                               << "caseLevel"
-                               << false
-                               << "caseFirst"
+                               << "caseLevel" << false << "caseFirst"
                                << "off"
-                               << "strength"
-                               << 3
-                               << "numericOrdering"
-                               << false
-                               << "alternate"
+                               << "strength" << 3 << "numericOrdering" << false << "alternate"
                                << "non-ignorable"
                                << "maxVariable"
                                << "space"
-                               << "normalization"
-                               << false
-                               << "backwards"
-                               << false
-                               << "version"
+                               << "normalization" << false << "backwards" << false << "version"
                                << "myVersion");
 
     ASSERT_BSONOBJ_EQ(expectedObj, collationSpec.toBSON());
diff --git a/src/mongo/db/query/collation/collator_factory_icu.cpp b/src/mongo/db/query/collation/collator_factory_icu.cpp
index f9662b0a22a..7f612265b71 100644
--- a/src/mongo/db/query/collation/collator_factory_icu.cpp
+++ b/src/mongo/db/query/collation/collator_factory_icu.cpp
@@ -186,13 +186,9 @@ StatusWith<CollationSpec::CaseFirstType> stringToCaseFirstType(const std::string
     } else {
         return {ErrorCodes::FailedToParse,
                 str::stream() << "Field '" << CollationSpec::kCaseFirstField << "' must be '"
-                              << CollationSpec::kCaseFirstUpper
-                              << "', '"
-                              << CollationSpec::kCaseFirstLower
-                              << "', or '"
-                              << CollationSpec::kCaseFirstOff
-                              << "'. Got: "
-                              << caseFirst};
+                              << CollationSpec::kCaseFirstUpper << "', '"
+                              << CollationSpec::kCaseFirstLower << "', or '"
+                              << CollationSpec::kCaseFirstOff << "'. Got: " << caseFirst};
     }
 }
 
@@ -211,8 +207,7 @@ StatusWith<CollationSpec::StrengthType> integerToStrengthType(long long strength
     }
     return {ErrorCodes::FailedToParse,
             str::stream() << "Field '" << CollationSpec::kStrengthField
-                          << "' must be an integer 1 through 5. Got: "
-                          << strength};
+                          << "' must be an integer 1 through 5. Got: " << strength};
 }
 
 StatusWith<CollationSpec::AlternateType> stringToAlternateType(const std::string& alternate) {
@@ -223,11 +218,8 @@ StatusWith<CollationSpec::AlternateType> stringToAlternateType(const std::string
     } else {
         return {ErrorCodes::FailedToParse,
                 str::stream() << "Field '" << CollationSpec::kAlternateField << "' must be '"
-                              << CollationSpec::kAlternateNonIgnorable
-                              << "' or '"
-                              << CollationSpec::kAlternateShifted
-                              << "'. Got: "
-                              << alternate};
+                              << CollationSpec::kAlternateNonIgnorable << "' or '"
+                              << CollationSpec::kAlternateShifted << "'. Got: " << alternate};
     }
 }
 
@@ -239,11 +231,8 @@ StatusWith<CollationSpec::MaxVariableType> stringToMaxVariableType(const std::st
     } else {
         return {ErrorCodes::FailedToParse,
                 str::stream() << "Field '" << CollationSpec::kMaxVariableField << "' must be '"
-                              << CollationSpec::kMaxVariablePunct
-                              << "' or '"
-                              << CollationSpec::kMaxVariableSpace
-                              << "'. Got: "
-                              << maxVariable};
+                              << CollationSpec::kMaxVariablePunct << "' or '"
+                              << CollationSpec::kMaxVariableSpace << "'. Got: " << maxVariable};
     }
 }
 
@@ -273,10 +262,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kCaseLevelField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.caseLevel = attributeToBool(caseLevelAttribute);
     } else if (!parseStatus.isOK()) {
@@ -290,10 +277,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kCaseLevelField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -308,10 +293,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kCaseFirstField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.caseFirst = getCaseFirstFromAttribute(caseFirstAttribute);
     } else if (!parseStatus.isOK()) {
@@ -333,10 +316,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kCaseFirstField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -351,10 +332,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kStrengthField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.strength = getStrengthFromAttribute(strengthAttribute);
     } else if (!parseStatus.isOK()) {
@@ -375,10 +354,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kStrengthField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -394,10 +371,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kNumericOrderingField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.numericOrdering = attributeToBool(numericOrderingAttribute);
     } else if (!parseStatus.isOK()) {
@@ -412,10 +387,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kNumericOrderingField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -431,10 +404,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kAlternateField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.alternate = getAlternateFromAttribute(alternateAttribute);
     } else if (!parseStatus.isOK()) {
@@ -456,10 +427,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kAlternateField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -486,10 +455,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kMaxVariableField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -505,10 +472,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kNormalizationField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.normalization = attributeToBool(normalizationAttribute);
     } else if (!parseStatus.isOK()) {
@@ -523,10 +488,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kNormalizationField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -542,10 +505,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to get '" << CollationSpec::kBackwardsField
-                                  << "' attribute from icu::Collator: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute from icu::Collator: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
         parsedSpec.backwards = attributeToBool(backwardsAttribute);
     } else if (!parseStatus.isOK()) {
@@ -560,10 +521,8 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             icuError.set(status);
             return {ErrorCodes::OperationFailed,
                     str::stream() << "Failed to set '" << CollationSpec::kBackwardsField
-                                  << "' attribute: "
-                                  << icuError.errorName()
-                                  << ". Collation spec: "
-                                  << spec};
+                                  << "' attribute: " << icuError.errorName()
+                                  << ". Collation spec: " << spec};
         }
     }
 
@@ -585,9 +544,7 @@ StatusWith<CollationSpec> parseToCollationSpec(const BSONObj& spec,
             return {ErrorCodes::IncompatibleCollationVersion,
                     str::stream() << "Requested collation version " << specVersionStr
                                   << " but the only available collator version was "
-                                  << parsedSpec.version
-                                  << ". Requested collation spec: "
-                                  << spec};
+                                  << parsedSpec.version << ". Requested collation spec: " << spec};
         }
 
         ++parsedFields;
@@ -613,8 +570,7 @@ StatusWith<std::string> parseLocaleID(const BSONObj& spec) {
     if (localeID.find('\0') != std::string::npos) {
         return {ErrorCodes::BadValue,
                 str::stream() << "Field '" << CollationSpec::kLocaleField
-                              << "' cannot contain null byte. Collation spec: "
-                              << spec};
+                              << "' cannot contain null byte. Collation spec: " << spec};
     }
     return localeID;
 }
@@ -630,15 +586,13 @@ Status validateLocaleID(const BSONObj& spec,
         icuError.set(status);
         return {ErrorCodes::OperationFailed,
                 str::stream() << "Failed to get locale from icu::Collator: " << icuError.errorName()
-                              << ". Collation spec: "
-                              << spec};
+                              << ". Collation spec: " << spec};
     }
 
     if (originalID.empty()) {
         return {ErrorCodes::BadValue,
                 str::stream() << "Field '" << CollationSpec::kLocaleField
-                              << "' cannot be the empty string in: "
-                              << spec};
+                              << "' cannot be the empty string in: " << spec};
     }
 
     // Check that each component of the locale ID is recognized by ICU. If ICU 1) cannot parse the
@@ -669,11 +623,9 @@ Status validateCollationSpec(const CollationSpec& spec) {
     if (spec.backwards && spec.strength == CollationSpec::StrengthType::kPrimary) {
         return {ErrorCodes::BadValue,
                 str::stream() << "'" << CollationSpec::kBackwardsField << "' is invalid with '"
-                              << CollationSpec::kStrengthField
-                              << "' of "
+                              << CollationSpec::kStrengthField << "' of "
                               << static_cast<int>(CollationSpec::StrengthType::kPrimary)
-                              << " in: "
-                              << spec.toBSON()};
+                              << " in: " << spec.toBSON()};
     }
 
     // The caseFirst option only affects tertiary level or caseLevel comparisons. It will have no
@@ -683,13 +635,10 @@ Status validateCollationSpec(const CollationSpec& spec) {
          spec.strength == CollationSpec::StrengthType::kSecondary)) {
         return {ErrorCodes::BadValue,
                 str::stream() << "'" << CollationSpec::kCaseFirstField << "' is invalid unless '"
-                              << CollationSpec::kCaseLevelField
-                              << "' is on or '"
-                              << CollationSpec::kStrengthField
-                              << "' is greater than "
+                              << CollationSpec::kCaseLevelField << "' is on or '"
+                              << CollationSpec::kStrengthField << "' is greater than "
                               << static_cast<int>(CollationSpec::StrengthType::kSecondary)
-                              << " in: "
-                              << spec.toBSON()};
+                              << " in: " << spec.toBSON()};
     }
 
     return Status::OK();
@@ -712,8 +661,7 @@ StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryICU::makeFromBSON(
             return {ErrorCodes::FailedToParse,
                     str::stream() << "If " << CollationSpec::kLocaleField << "="
                                   << CollationSpec::kSimpleBinaryComparison
-                                  << ", no other fields should be present in: "
-                                  << spec};
+                                  << ", no other fields should be present in: " << spec};
         }
         return {nullptr};
     }
@@ -722,8 +670,8 @@ StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryICU::makeFromBSON(
     auto userLocale = icu::Locale::createFromName(parsedLocaleID.getValue().c_str());
     if (userLocale.isBogus()) {
         return {ErrorCodes::BadValue,
-                str::stream() << "Field '" << CollationSpec::kLocaleField << "' is not valid in: "
-                              << spec};
+                str::stream() << "Field '" << CollationSpec::kLocaleField
+                              << "' is not valid in: " << spec};
     }
 
     // Construct an icu::Collator.
@@ -734,8 +682,7 @@ StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryICU::makeFromBSON(
         icuError.set(status);
         return {ErrorCodes::OperationFailed,
                 str::stream() << "Failed to create collator: " << icuError.errorName()
-                              << ". Collation spec: "
-                              << spec};
+                              << ". Collation spec: " << spec};
     }
 
     Status localeValidationStatus = validateLocaleID(spec, parsedLocaleID.getValue(), *icuCollator);
diff --git a/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp b/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp
index 654f4f4c7b3..6eacae4c5a1 100644
--- a/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp
+++ b/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp
@@ -40,9 +40,7 @@ namespace mongo {
 namespace {
 
 ServiceContext::ConstructorActionRegisterer registerIcuCollator{
-    "CreateCollatorFactory",
-    {"LoadICUData"},
-    [](ServiceContext* service) {
+    "CreateCollatorFactory", {"LoadICUData"}, [](ServiceContext* service) {
         CollatorFactoryInterface::set(service, std::make_unique<CollatorFactoryICU>());
     }};
 }  // namespace
diff --git a/src/mongo/db/query/collation/collator_factory_icu_test.cpp b/src/mongo/db/query/collation/collator_factory_icu_test.cpp
index 7024303dffd..d7d0edce54b 100644
--- a/src/mongo/db/query/collation/collator_factory_icu_test.cpp
+++ b/src/mongo/db/query/collation/collator_factory_icu_test.cpp
@@ -61,8 +61,7 @@ TEST(CollatorFactoryICUTest, SimpleLocaleWithOtherFieldsFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "simple"
-                                              << "caseLevel"
-                                              << true));
+                                              << "caseLevel" << true));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::FailedToParse);
 }
@@ -444,8 +443,7 @@ TEST(CollatorFactoryICUTest, CaseLevelFalseParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "caseLevel"
-                                              << false));
+                                              << "caseLevel" << false));
     ASSERT_OK(collator.getStatus());
     ASSERT_FALSE(collator.getValue()->getSpec().caseLevel);
 }
@@ -454,8 +452,7 @@ TEST(CollatorFactoryICUTest, CaseLevelTrueParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "caseLevel"
-                                              << true));
+                                              << "caseLevel" << true));
     ASSERT_OK(collator.getStatus());
     ASSERT_TRUE(collator.getValue()->getSpec().caseLevel);
 }
@@ -497,8 +494,7 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1));
+                                              << "strength" << 1));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kPrimary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -508,8 +504,7 @@ TEST(CollatorFactoryICUTest, SecondaryStrengthParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 2));
+                                              << "strength" << 2));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kSecondary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -519,8 +514,7 @@ TEST(CollatorFactoryICUTest, TertiaryStrengthParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 3));
+                                              << "strength" << 3));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kTertiary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -530,8 +524,7 @@ TEST(CollatorFactoryICUTest, QuaternaryStrengthParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 4));
+                                              << "strength" << 4));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kQuaternary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -541,8 +534,7 @@ TEST(CollatorFactoryICUTest, IdenticalStrengthParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 5));
+                                              << "strength" << 5));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kIdentical),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -552,8 +544,7 @@ TEST(CollatorFactoryICUTest, NumericOrderingFalseParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "numericOrdering"
-                                              << false));
+                                              << "numericOrdering" << false));
     ASSERT_OK(collator.getStatus());
     ASSERT_FALSE(collator.getValue()->getSpec().numericOrdering);
 }
@@ -562,8 +553,7 @@ TEST(CollatorFactoryICUTest, NumericOrderingTrueParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "numericOrdering"
-                                              << true));
+                                              << "numericOrdering" << true));
     ASSERT_OK(collator.getStatus());
     ASSERT_TRUE(collator.getValue()->getSpec().numericOrdering);
 }
@@ -616,8 +606,7 @@ TEST(CollatorFactoryICUTest, NormalizationFalseParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "normalization"
-                                              << false));
+                                              << "normalization" << false));
     ASSERT_OK(collator.getStatus());
     ASSERT_FALSE(collator.getValue()->getSpec().normalization);
 }
@@ -626,8 +615,7 @@ TEST(CollatorFactoryICUTest, NormalizationTrueParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "normalization"
-                                              << true));
+                                              << "normalization" << true));
     ASSERT_OK(collator.getStatus());
     ASSERT_TRUE(collator.getValue()->getSpec().normalization);
 }
@@ -636,8 +624,7 @@ TEST(CollatorFactoryICUTest, BackwardsFalseParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "backwards"
-                                              << false));
+                                              << "backwards" << false));
     ASSERT_OK(collator.getStatus());
     ASSERT_FALSE(collator.getValue()->getSpec().backwards);
 }
@@ -646,8 +633,7 @@ TEST(CollatorFactoryICUTest, BackwardsTrueParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "backwards"
-                                              << true));
+                                              << "backwards" << true));
     ASSERT_OK(collator.getStatus());
     ASSERT_TRUE(collator.getValue()->getSpec().backwards);
 }
@@ -656,8 +642,7 @@ TEST(CollatorFactoryICUTest, LongStrengthFieldParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1LL));
+                                              << "strength" << 1LL));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kPrimary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -667,8 +652,7 @@ TEST(CollatorFactoryICUTest, DoubleStrengthFieldParsesSuccessfully) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1.0));
+                                              << "strength" << 1.0));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(static_cast<int>(CollationSpec::StrengthType::kPrimary),
               static_cast<int>(collator.getValue()->getSpec().strength));
@@ -688,8 +672,7 @@ TEST(CollatorFactoryICUTest, NonStringCaseFirstFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "caseFirst"
-                                              << 1));
+                                              << "caseFirst" << 1));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::TypeMismatch);
 }
@@ -718,8 +701,7 @@ TEST(CollatorFactoryICUTest, TooLargeStrengthFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 2147483648LL));
+                                              << "strength" << 2147483648LL));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::FailedToParse);
 }
@@ -728,8 +710,7 @@ TEST(CollatorFactoryICUTest, FractionalStrengthFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 0.5));
+                                              << "strength" << 0.5));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::BadValue);
 }
@@ -738,8 +719,7 @@ TEST(CollatorFactoryICUTest, NegativeStrengthFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << -1));
+                                              << "strength" << -1));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::FailedToParse);
 }
@@ -748,8 +728,7 @@ TEST(CollatorFactoryICUTest, InvalidIntegerStrengthFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 6));
+                                              << "strength" << 6));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::FailedToParse);
 }
@@ -768,8 +747,7 @@ TEST(CollatorFactoryICUTest, NonStringAlternateFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "alternate"
-                                              << 1));
+                                              << "alternate" << 1));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::TypeMismatch);
 }
@@ -788,8 +766,7 @@ TEST(CollatorFactoryICUTest, NonStringMaxVariableFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "maxVariable"
-                                              << 1));
+                                              << "maxVariable" << 1));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::TypeMismatch);
 }
@@ -846,8 +823,7 @@ TEST(CollatorFactoryICUTest, NonStringVersionFieldFailsToParse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "version"
-                                              << 3));
+                                              << "version" << 3));
     ASSERT_NOT_OK(collator.getStatus());
     ASSERT_EQ(collator.getStatus(), ErrorCodes::TypeMismatch);
 }
@@ -879,8 +855,7 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthCollatorIgnoresCaseAndAccents) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1));
+                                              << "strength" << 1));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -892,8 +867,7 @@ TEST(CollatorFactoryICUTest, SecondaryStrengthCollatorsIgnoresCaseButNotAccents)
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 2));
+                                              << "strength" << 2));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -905,8 +879,7 @@ TEST(CollatorFactoryICUTest, TertiaryStrengthCollatorConsidersCaseAndAccents) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 3));
+                                              << "strength" << 3));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -918,10 +891,7 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthCaseLevelTrue) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1
-                                              << "caseLevel"
-                                              << true));
+                                              << "strength" << 1 << "caseLevel" << true));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -931,14 +901,11 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthCaseLevelTrue) {
 
 TEST(CollatorFactoryICUTest, PrimaryStrengthCaseLevelTrueCaseFirstUpper) {
     CollatorFactoryICU factory;
-    auto collator = factory.makeFromBSON(BSON("locale"
-                                              << "en_US"
-                                              << "strength"
-                                              << 1
-                                              << "caseLevel"
-                                              << true
-                                              << "caseFirst"
-                                              << "upper"));
+    auto collator =
+        factory.makeFromBSON(BSON("locale"
+                                  << "en_US"
+                                  << "strength" << 1 << "caseLevel" << true << "caseFirst"
+                                  << "upper"));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -948,14 +915,11 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthCaseLevelTrueCaseFirstUpper) {
 
 TEST(CollatorFactoryICUTest, TertiaryStrengthCaseLevelTrueCaseFirstUpper) {
     CollatorFactoryICU factory;
-    auto collator = factory.makeFromBSON(BSON("locale"
-                                              << "en_US"
-                                              << "strength"
-                                              << 3
-                                              << "caseLevel"
-                                              << true
-                                              << "caseFirst"
-                                              << "upper"));
+    auto collator =
+        factory.makeFromBSON(BSON("locale"
+                                  << "en_US"
+                                  << "strength" << 3 << "caseLevel" << true << "caseFirst"
+                                  << "upper"));
     ASSERT_OK(collator.getStatus());
     ASSERT_LT(collator.getValue()->compare("A", "a"), 0);
 }
@@ -972,8 +936,7 @@ TEST(CollatorFactoryICUTest, NumericOrderingTrue) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "numericOrdering"
-                                              << true));
+                                              << "numericOrdering" << true));
     ASSERT_OK(collator.getStatus());
     ASSERT_LT(collator.getValue()->compare("2", "10"), 0);
 }
@@ -982,9 +945,7 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthAlternateShifted) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1
-                                              << "alternate"
+                                              << "strength" << 1 << "alternate"
                                               << "shifted"));
     ASSERT_OK(collator.getStatus());
     ASSERT_EQ(collator.getValue()->compare("a b", "ab"), 0);
@@ -995,9 +956,7 @@ TEST(CollatorFactoryICUTest, QuaternaryStrengthAlternateShifted) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 4
-                                              << "alternate"
+                                              << "strength" << 4 << "alternate"
                                               << "shifted"));
     ASSERT_OK(collator.getStatus());
     ASSERT_LT(collator.getValue()->compare("a b", "ab"), 0);
@@ -1008,9 +967,7 @@ TEST(CollatorFactoryICUTest, PrimaryStrengthAlternateShiftedMaxVariableSpace) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 1
-                                              << "alternate"
+                                              << "strength" << 1 << "alternate"
                                               << "shifted"
                                               << "maxVariable"
                                               << "space"));
@@ -1023,8 +980,7 @@ TEST(CollatorFactoryICUTest, SecondaryStrengthBackwardsFalse) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 2));
+                                              << "strength" << 2));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -1035,10 +991,7 @@ TEST(CollatorFactoryICUTest, SecondaryStrengthBackwardsTrue) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "strength"
-                                              << 2
-                                              << "backwards"
-                                              << true));
+                                              << "strength" << 2 << "backwards" << true));
     ASSERT_OK(collator.getStatus());
 
     // u8"\u00E1" is latin small letter a with acute.
@@ -1069,10 +1022,7 @@ TEST(CollatorFactoryICUTest, BackwardsTrueWithStrengthOneFails) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "backwards"
-                                              << true
-                                              << "strength"
-                                              << 1));
+                                              << "backwards" << true << "strength" << 1));
     ASSERT_NOT_OK(collator.getStatus());
 }
 
@@ -1080,10 +1030,7 @@ TEST(CollatorFactoryICUTest, BackwardsTrueWithStrengthTwoSucceeds) {
     CollatorFactoryICU factory;
     auto collator = factory.makeFromBSON(BSON("locale"
                                               << "en_US"
-                                              << "backwards"
-                                              << true
-                                              << "strength"
-                                              << 2));
+                                              << "backwards" << true << "strength" << 2));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1093,8 +1040,7 @@ TEST(CollatorFactoryICUTest, CaseFirstLowerWithStrengthThreeSucceeds) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "lower"
-                                              << "strength"
-                                              << 3));
+                                              << "strength" << 3));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1104,8 +1050,7 @@ TEST(CollatorFactoryICUTest, CaseFirstUpperWithStrengthThreeSucceeds) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "upper"
-                                              << "strength"
-                                              << 3));
+                                              << "strength" << 3));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1115,10 +1060,7 @@ TEST(CollatorFactoryICUTest, CaseFirstLowerWithCaseLevelSucceeds) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "lower"
-                                              << "caseLevel"
-                                              << true
-                                              << "strength"
-                                              << 1));
+                                              << "caseLevel" << true << "strength" << 1));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1128,10 +1070,7 @@ TEST(CollatorFactoryICUTest, CaseFirstUpperWithCaseLevelSucceeds) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "upper"
-                                              << "caseLevel"
-                                              << true
-                                              << "strength"
-                                              << 1));
+                                              << "caseLevel" << true << "strength" << 1));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1141,8 +1080,7 @@ TEST(CollatorFactoryICUTest, CaseFirstOffWithStrengthOneSucceeds) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "off"
-                                              << "strength"
-                                              << 1));
+                                              << "strength" << 1));
     ASSERT_OK(collator.getStatus());
 }
 
@@ -1152,8 +1090,7 @@ TEST(CollatorFactoryICUTest, CaseFirstLowerWithStrengthOneFails) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "lower"
-                                              << "strength"
-                                              << 1));
+                                              << "strength" << 1));
     ASSERT_NOT_OK(collator.getStatus());
 }
 
@@ -1163,8 +1100,7 @@ TEST(CollatorFactoryICUTest, CaseFirstLowerWithStrengthTwoFails) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "lower"
-                                              << "strength"
-                                              << 2));
+                                              << "strength" << 2));
     ASSERT_NOT_OK(collator.getStatus());
 }
 
@@ -1174,8 +1110,7 @@ TEST(CollatorFactoryICUTest, CaseFirstUpperWithStrengthOneFails) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "upper"
-                                              << "strength"
-                                              << 1));
+                                              << "strength" << 1));
     ASSERT_NOT_OK(collator.getStatus());
 }
 
@@ -1185,8 +1120,7 @@ TEST(CollatorFactoryICUTest, CaseFirstUpperWithStrengthTwoFails) {
                                               << "en_US"
                                               << "caseFirst"
                                               << "upper"
-                                              << "strength"
-                                              << 2));
+                                              << "strength" << 2));
     ASSERT_NOT_OK(collator.getStatus());
 }
 
diff --git a/src/mongo/db/query/collation/collator_interface_mock_test.cpp b/src/mongo/db/query/collation/collator_interface_mock_test.cpp
index d792d95c2a1..340e9690ef6 100644
--- a/src/mongo/db/query/collation/collator_interface_mock_test.cpp
+++ b/src/mongo/db/query/collation/collator_interface_mock_test.cpp
@@ -242,10 +242,12 @@ TEST(CollatorInterfaceMockSelfTest, BSONObjsEqualUnderCollatorHashEquallyNested)
     SimpleBSONObjComparator bsonCmpConsiderCase;
     BSONObjComparator bsonCmpIgnoreCase(
         BSONObj(), BSONObjComparator::FieldNamesMode::kConsider, &toLowerCollator);
-    BSONObj obj1 = BSON("a" << 1 << "b" << BSON("c"
-                                                << "foo"));
-    BSONObj obj2 = BSON("a" << 1 << "b" << BSON("c"
-                                                << "FOO"));
+    BSONObj obj1 = BSON("a" << 1 << "b"
+                            << BSON("c"
+                                    << "foo"));
+    BSONObj obj2 = BSON("a" << 1 << "b"
+                            << BSON("c"
+                                    << "FOO"));
     ASSERT_NE(bsonCmpConsiderCase.hash(obj1), bsonCmpConsiderCase.hash(obj2));
     ASSERT_EQ(bsonCmpIgnoreCase.hash(obj1), bsonCmpIgnoreCase.hash(obj2));
 }