SERVER-40476 remove mongoutils::str

    Rename utils/mongoutils/str.h => utils/str.h
    Rename namespace mongoutils::str => str
    Rename mongo::strcasecmp => str::caseInsensitiveCompare.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/query/query_planner_test_fixture.cpp b/src/mongo/db/query/query_planner_test_fixture.cpp
index d04d3060b4a..59306ff1feb 100644
--- a/src/mongo/db/query/query_planner_test_fixture.cpp
+++ b/src/mongo/db/query/query_planner_test_fixture.cpp
@@ -473,12 +473,12 @@ size_t QueryPlannerTest::getNumSolutions() const {
 }
 
 void QueryPlannerTest::dumpSolutions() const {
-    mongoutils::str::stream ost;
+    str::stream ost;
     dumpSolutions(ost);
     log() << std::string(ost);
 }
 
-void QueryPlannerTest::dumpSolutions(mongoutils::str::stream& ost) const {
+void QueryPlannerTest::dumpSolutions(str::stream& ost) const {
     for (auto&& soln : solns) {
         ost << soln->toString() << '\n';
     }
@@ -488,7 +488,7 @@ void QueryPlannerTest::assertNumSolutions(size_t expectSolutions) const {
     if (getNumSolutions() == expectSolutions) {
         return;
     }
-    mongoutils::str::stream ss;
+    str::stream ss;
     ss << "expected " << expectSolutions << " solutions but got " << getNumSolutions()
        << " instead. solutions generated: " << '\n';
     dumpSolutions(ss);
@@ -512,7 +512,7 @@ void QueryPlannerTest::assertSolutionExists(const std::string& solnJson, size_t
     if (numMatches == matches) {
         return;
     }
-    mongoutils::str::stream ss;
+    str::stream ss;
     ss << "expected " << numMatches << " matches for solution " << solnJson << " but got "
        << matches << " instead. all solutions generated: " << '\n';
     dumpSolutions(ss);
@@ -530,7 +530,7 @@ void QueryPlannerTest::assertHasOneSolutionOf(const std::vector<std::string>& so
     if (1U == matches) {
         return;
     }
-    mongoutils::str::stream ss;
+    str::stream ss;
     ss << "assertHasOneSolutionOf expected one matching solution"
        << " but got " << matches << " instead. all solutions generated: " << '\n';
     dumpSolutions(ss);