SERVER-40476 remove mongoutils::str

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

40 files changed, 87 insertions, 101 deletions

diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 648a1a67607..2167b2849ec 100644
--- a/src/mongo/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
@@ -47,9 +47,9 @@
 #include "mongo/util/debugger.h"
 #include "mongo/util/exit.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/quick_exit.h"
 #include "mongo/util/stacktrace.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/assert_util_test.cpp b/src/mongo/util/assert_util_test.cpp
index 7b159493333..25516602071 100644
--- a/src/mongo/util/assert_util_test.cpp
+++ b/src/mongo/util/assert_util_test.cpp
@@ -38,7 +38,7 @@
 #include "mongo/unittest/death_test.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 namespace {
diff --git a/src/mongo/util/background.cpp b/src/mongo/util/background.cpp
index 93bb11ec1c2..3627a413f1b 100644
--- a/src/mongo/util/background.cpp
+++ b/src/mongo/util/background.cpp
@@ -44,7 +44,7 @@
 #include "mongo/util/concurrency/thread_name.h"
 #include "mongo/util/debug_util.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/timer.h"
 
 namespace mongo {
@@ -165,7 +165,7 @@ void BackgroundJob::jobBody() {
 void BackgroundJob::go() {
     stdx::unique_lock<stdx::mutex> l(_status->mutex);
     massert(17234,
-            mongoutils::str::stream() << "backgroundJob already running: " << name(),
+            str::stream() << "backgroundJob already running: " << name(),
             _status->state != Running);
 
     // If the job is already 'done', for instance because it was cancelled or already
diff --git a/src/mongo/util/cmdline_utils/censor_cmdline.cpp b/src/mongo/util/cmdline_utils/censor_cmdline.cpp
index 50c17bcae18..746daf24b2d 100644
--- a/src/mongo/util/cmdline_utils/censor_cmdline.cpp
+++ b/src/mongo/util/cmdline_utils/censor_cmdline.cpp
@@ -32,17 +32,18 @@
 #include <set>
 #include <string>
 
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 namespace cmdline_utils {
 
 namespace {
+
 struct InsensitiveCompare {
     bool operator()(const std::string& a, const std::string& b) const {
-        return strcasecmp(a.c_str(), b.c_str()) < 0;
+        return str::caseInsensitiveCompare(a.c_str(), b.c_str()) < 0;
     }
 };
 
diff --git a/src/mongo/util/concurrency/thread_name.cpp b/src/mongo/util/concurrency/thread_name.cpp
index 26cfdc04076..7aa58a3b6f4 100644
--- a/src/mongo/util/concurrency/thread_name.cpp
+++ b/src/mongo/util/concurrency/thread_name.cpp
@@ -53,7 +53,7 @@
 #include "mongo/config.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp
index 5f732c1a1ed..69e4e0f64b3 100644
--- a/src/mongo/util/concurrency/thread_pool.cpp
+++ b/src/mongo/util/concurrency/thread_pool.cpp
@@ -39,7 +39,7 @@
 #include "mongo/util/concurrency/idle_thread_block.h"
 #include "mongo/util/concurrency/thread_name.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/concurrency/ticketholder.cpp b/src/mongo/util/concurrency/ticketholder.cpp
index 4b61cf96e37..d836f977b67 100644
--- a/src/mongo/util/concurrency/ticketholder.cpp
+++ b/src/mongo/util/concurrency/ticketholder.cpp
@@ -36,7 +36,7 @@
 #include <iostream>
 
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/descriptive_stats-inl.h b/src/mongo/util/descriptive_stats-inl.h
index bd30229b337..1b7239a3cbf 100644
--- a/src/mongo/util/descriptive_stats-inl.h
+++ b/src/mongo/util/descriptive_stats-inl.h
@@ -32,7 +32,7 @@
 #include <algorithm>
 #include <limits>
 
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
@@ -189,8 +189,7 @@ BSONObj SummaryEstimators<Sample, NumQuantiles>::statisticSummaryToBSONObj() con
         for (size_t i = 1; i <= NumQuantiles; i++) {
             const double probability = this->DistributionEstimators<NumQuantiles>::probability(i);
             const double quantile = this->DistributionEstimators<NumQuantiles>::quantile(i);
-            quantilesBuilder.append(std::string(mongoutils::str::stream() << probability),
-                                    quantile);
+            quantilesBuilder.append(std::string(str::stream() << probability), quantile);
         }
         quantilesBuilder.doneFast();
     }
diff --git a/src/mongo/util/dns_name.h b/src/mongo/util/dns_name.h
index 772948b7d35..023bee10516 100644
--- a/src/mongo/util/dns_name.h
+++ b/src/mongo/util/dns_name.h
@@ -41,7 +41,7 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/util/builder.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 namespace dns {
diff --git a/src/mongo/util/duration.h b/src/mongo/util/duration.h
index 4564104f7b4..5cf82336aa6 100644
--- a/src/mongo/util/duration.h
+++ b/src/mongo/util/duration.h
@@ -39,7 +39,7 @@
 #include "mongo/stdx/chrono.h"
 #include "mongo/stdx/type_traits.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/errno_util.cpp b/src/mongo/util/errno_util.cpp
index 29a76013aca..eb9359c0e15 100644
--- a/src/mongo/util/errno_util.cpp
+++ b/src/mongo/util/errno_util.cpp
@@ -38,8 +38,8 @@
 #include <errno.h>  // For errno
 #endif
 
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
 namespace mongo {
diff --git a/src/mongo/util/fail_point.cpp b/src/mongo/util/fail_point.cpp
index ca70ecd7afd..9aac1298b07 100644
--- a/src/mongo/util/fail_point.cpp
+++ b/src/mongo/util/fail_point.cpp
@@ -37,7 +37,7 @@
 #include "mongo/stdx/thread.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/time_support.h"
 
 namespace mongo {
diff --git a/src/mongo/util/fail_point_registry.cpp b/src/mongo/util/fail_point_registry.cpp
index 351cbe2d0da..158d6ab8023 100644
--- a/src/mongo/util/fail_point_registry.cpp
+++ b/src/mongo/util/fail_point_registry.cpp
@@ -33,7 +33,7 @@
 #include "mongo/util/fail_point_server_parameter_gen.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/map_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/file.cpp b/src/mongo/util/file.cpp
index 1aa2133e5e8..6cb07dcba9b 100644
--- a/src/mongo/util/file.cpp
+++ b/src/mongo/util/file.cpp
@@ -47,7 +47,7 @@
 #include "mongo/util/allocator.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
 namespace mongo {
@@ -138,14 +138,13 @@ void File::read(fileofs o, char* data, unsigned len) {
     } else if (bytesRead != len) {
         _bad = true;
         msgasserted(10438,
-                    mongoutils::str::stream() << "In File::read(), ReadFile for '" << _name
-                                              << "' read "
-                                              << bytesRead
-                                              << " bytes while trying to read "
-                                              << len
-                                              << " bytes starting at offset "
-                                              << o
-                                              << ", truncated file?");
+                    str::stream() << "In File::read(), ReadFile for '" << _name << "' read "
+                                  << bytesRead
+                                  << " bytes while trying to read "
+                                  << len
+                                  << " bytes starting at offset "
+                                  << o
+                                  << ", truncated file?");
     }
 }
 
@@ -264,14 +263,13 @@ void File::read(fileofs o, char* data, unsigned len) {
     } else if (bytesRead != static_cast<ssize_t>(len)) {
         _bad = true;
         msgasserted(16569,
-                    mongoutils::str::stream() << "In File::read(), ::pread for '" << _name
-                                              << "' read "
-                                              << bytesRead
-                                              << " bytes while trying to read "
-                                              << len
-                                              << " bytes starting at offset "
-                                              << o
-                                              << ", truncated file?");
+                    str::stream() << "In File::read(), ::pread for '" << _name << "' read "
+                                  << bytesRead
+                                  << " bytes while trying to read "
+                                  << len
+                                  << " bytes starting at offset "
+                                  << o
+                                  << ", truncated file?");
     }
 }
 
diff --git a/src/mongo/util/hex.h b/src/mongo/util/hex.h
index 37deef904a8..d58364fe54f 100644
--- a/src/mongo/util/hex.h
+++ b/src/mongo/util/hex.h
@@ -35,7 +35,7 @@
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/util/builder.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 // can't use hex namespace because it conflicts with hex iostream function
diff --git a/src/mongo/util/icu.cpp b/src/mongo/util/icu.cpp
index 14f7c174ee3..ea4961f31aa 100644
--- a/src/mongo/util/icu.cpp
+++ b/src/mongo/util/icu.cpp
@@ -42,7 +42,7 @@
 #include <vector>
 
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 namespace {
diff --git a/src/mongo/util/intrusive_counter.cpp b/src/mongo/util/intrusive_counter.cpp
index 92eeb0b4bb8..59b177a1fc3 100644
--- a/src/mongo/util/intrusive_counter.cpp
+++ b/src/mongo/util/intrusive_counter.cpp
@@ -31,11 +31,10 @@
 
 #include "mongo/util/intrusive_counter.h"
 
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 using boost::intrusive_ptr;
-using namespace mongoutils;
 
 intrusive_ptr<const RCString> RCString::create(StringData s) {
     uassert(16493,
diff --git a/src/mongo/util/net/hostandport.cpp b/src/mongo/util/net/hostandport.cpp
index 6eab3a7aa7d..19786d0f375 100644
--- a/src/mongo/util/net/hostandport.cpp
+++ b/src/mongo/util/net/hostandport.cpp
@@ -39,7 +39,7 @@
 #include "mongo/bson/util/builder.h"
 #include "mongo/db/server_options.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
diff --git a/src/mongo/util/net/http_client_winhttp.cpp b/src/mongo/util/net/http_client_winhttp.cpp
index 27a5da5cb66..4ddab8046aa 100644
--- a/src/mongo/util/net/http_client_winhttp.cpp
+++ b/src/mongo/util/net/http_client_winhttp.cpp
@@ -50,9 +50,9 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/errno_util.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/http_client.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 #include "mongo/util/winutil.h"
 
diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index f56a0a31778..6d7b2d1e8f7 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -63,11 +63,11 @@
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/hex.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/private/socket_poll.h"
 #include "mongo/util/net/socket_exception.h"
 #include "mongo/util/net/socket_utils.h"
 #include "mongo/util/net/ssl_manager.h"
+#include "mongo/util/str.h"
 #include "mongo/util/winutil.h"
 
 namespace mongo {
diff --git a/src/mongo/util/net/sockaddr.cpp b/src/mongo/util/net/sockaddr.cpp
index 819702ddca3..be88e9c206e 100644
--- a/src/mongo/util/net/sockaddr.cpp
+++ b/src/mongo/util/net/sockaddr.cpp
@@ -134,7 +134,7 @@ SockAddr::SockAddr(StringData target, int port, sa_family_t familyHint)
         _hostOrIp = "127.0.0.1";
     }
 
-    if (mongoutils::str::contains(_hostOrIp, '/') || familyHint == AF_UNIX) {
+    if (str::contains(_hostOrIp, '/') || familyHint == AF_UNIX) {
         initUnixDomainSocket(_hostOrIp, port);
         return;
     }
@@ -165,7 +165,7 @@ SockAddr::SockAddr(StringData target, int port, sa_family_t familyHint)
 
 std::vector<SockAddr> SockAddr::createAll(StringData target, int port, sa_family_t familyHint) {
     std::string hostOrIp = target.toString();
-    if (mongoutils::str::contains(hostOrIp, '/')) {
+    if (str::contains(hostOrIp, '/')) {
         std::vector<SockAddr> ret = {SockAddr()};
         ret[0].initUnixDomainSocket(hostOrIp, port);
         // Currently, this is always valid since initUnixDomainSocket()
@@ -281,9 +281,8 @@ std::string SockAddr::getAddr() const {
             const int buflen = 128;
             char buffer[buflen];
             int ret = getnameinfo(raw(), addressSize, buffer, buflen, NULL, 0, NI_NUMERICHOST);
-            massert(13082,
-                    mongoutils::str::stream() << "getnameinfo error " << getAddrInfoStrError(ret),
-                    ret == 0);
+            massert(
+                13082, str::stream() << "getnameinfo error " << getAddrInfoStrError(ret), ret == 0);
             return buffer;
         }
 
diff --git a/src/mongo/util/net/socket_exception.cpp b/src/mongo/util/net/socket_exception.cpp
index eaf83cdf04b..29b3cdf038f 100644
--- a/src/mongo/util/net/socket_exception.cpp
+++ b/src/mongo/util/net/socket_exception.cpp
@@ -31,7 +31,7 @@
 
 #include "mongo/util/net/socket_exception.h"
 
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/net/socket_utils.cpp b/src/mongo/util/net/socket_utils.cpp
index 556d41edb8c..f58ff484ec7 100644
--- a/src/mongo/util/net/socket_utils.cpp
+++ b/src/mongo/util/net/socket_utils.cpp
@@ -57,9 +57,9 @@
 #include "mongo/util/concurrency/value.h"
 #include "mongo/util/errno_util.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/sockaddr.h"
 #include "mongo/util/quick_exit.h"
+#include "mongo/util/str.h"
 #include "mongo/util/winutil.h"
 
 namespace mongo {
@@ -175,7 +175,7 @@ void setSocketKeepAliveParams(int sock,
 }
 
 std::string makeUnixSockPath(int port) {
-    return mongoutils::str::stream() << serverGlobalParams.socket << "/mongodb-" << port << ".sock";
+    return str::stream() << serverGlobalParams.socket << "/mongodb-" << port << ".sock";
 }
 
 // If an ip address is passed in, just return that.  If a hostname is passed
diff --git a/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp b/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp
index 798db875256..a78460e8d97 100644
--- a/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp
+++ b/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp
@@ -39,11 +39,11 @@
 #include "asio/error.hpp"
 
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/ssl/apple.hpp"
 #include "mongo/util/net/ssl/detail/engine.hpp"
 #include "mongo/util/net/ssl/detail/stream_core.hpp"
 #include "mongo/util/net/ssl/error.hpp"
+#include "mongo/util/str.h"
 
 namespace asio {
 namespace ssl {
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index d1b0cfe96df..3e69faa8437 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -47,9 +47,9 @@
 #include "mongo/util/hex.h"
 #include "mongo/util/icu.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/ssl_options.h"
 #include "mongo/util/net/ssl_parameters_gen.h"
+#include "mongo/util/str.h"
 #include "mongo/util/synchronized_value.h"
 #include "mongo/util/text.h"
 
@@ -298,9 +298,9 @@ void canonicalizeClusterDN(std::vector<std::string>* dn) {
     for (size_t i = 0; i < dn->size(); i++) {
         std::string& comp = dn->at(i);
         boost::algorithm::trim(comp);
-        if (!mongoutils::str::startsWith(comp.c_str(), "DC=") &&
-            !mongoutils::str::startsWith(comp.c_str(), "O=") &&
-            !mongoutils::str::startsWith(comp.c_str(), "OU=")) {
+        if (!str::startsWith(comp.c_str(), "DC=") &&  //
+            !str::startsWith(comp.c_str(), "O=") &&   //
+            !str::startsWith(comp.c_str(), "OU=")) {
             dn->erase(dn->begin() + i);
             i--;
         }
@@ -1158,10 +1158,8 @@ SSLManagerInterface* getSSLManager() {
     return theSSLManager;
 }
 
-}  // namespace mongo
-
 // TODO SERVER-11601 Use NFC Unicode canonicalization
-bool mongo::hostNameMatchForX509Certificates(std::string nameToMatch, std::string certHostName) {
+bool hostNameMatchForX509Certificates(std::string nameToMatch, std::string certHostName) {
     nameToMatch = removeFQDNRoot(std::move(nameToMatch));
     certHostName = removeFQDNRoot(std::move(certHostName));
 
@@ -1173,8 +1171,10 @@ bool mongo::hostNameMatchForX509Certificates(std::string nameToMatch, std::strin
     if (certHostName[0] == '*' && certHostName[1] == '.') {
         // allow name.example.com if the cert is *.example.com, '*' does not match '.'
         const char* subName = strchr(nameToMatch.c_str(), '.');
-        return subName && !strcasecmp(certHostName.c_str() + 1, subName);
+        return subName && !str::caseInsensitiveCompare(certHostName.c_str() + 1, subName);
     } else {
-        return !strcasecmp(nameToMatch.c_str(), certHostName.c_str());
+        return !str::caseInsensitiveCompare(nameToMatch.c_str(), certHostName.c_str());
     }
 }
+
+}  // namespace mongo
diff --git a/src/mongo/util/net/ssl_manager_openssl.cpp b/src/mongo/util/net/ssl_manager_openssl.cpp
index 09336136a47..8ebdf5158ef 100644
--- a/src/mongo/util/net/ssl_manager_openssl.cpp
+++ b/src/mongo/util/net/ssl_manager_openssl.cpp
@@ -54,7 +54,6 @@
 #include "mongo/util/debug_util.h"
 #include "mongo/util/exit.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/cidr.h"
 #include "mongo/util/net/dh_openssl.h"
 #include "mongo/util/net/private/ssl_expiration.h"
@@ -62,6 +61,7 @@
 #include "mongo/util/net/ssl_options.h"
 #include "mongo/util/net/ssl_types.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
 #ifndef _WIN32
diff --git a/src/mongo/util/net/ssl_manager_windows.cpp b/src/mongo/util/net/ssl_manager_windows.cpp
index a7d350400fa..95b5bda7bd8 100644
--- a/src/mongo/util/net/ssl_manager_windows.cpp
+++ b/src/mongo/util/net/ssl_manager_windows.cpp
@@ -53,13 +53,13 @@
 #include "mongo/util/exit.h"
 #include "mongo/util/hex.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/private/ssl_expiration.h"
 #include "mongo/util/net/sockaddr.h"
 #include "mongo/util/net/socket_exception.h"
 #include "mongo/util/net/ssl.hpp"
 #include "mongo/util/net/ssl_options.h"
 #include "mongo/util/net/ssl_types.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 #include "mongo/util/uuid.h"
 
diff --git a/src/mongo/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
index d58f22203a2..be93b6588c1 100644
--- a/src/mongo/util/ntservice.cpp
+++ b/src/mongo/util/ntservice.cpp
@@ -246,7 +246,7 @@ std::vector<std::string> constructServiceArgv(const std::vector<std::string>& in
 
         std::string name;
         std::string value;
-        bool foundEqualSign = mongoutils::str::splitOn(*iter, '=', name, value);
+        bool foundEqualSign = str::splitOn(*iter, '=', name, value);
         if (!foundEqualSign)
             name = *iter;
         if (optionsWithArgumentsToStripEnd !=
diff --git a/src/mongo/util/options_parser/options_parser.cpp b/src/mongo/util/options_parser/options_parser.cpp
index 62a053ee3a4..6627250c329 100644
--- a/src/mongo/util/options_parser/options_parser.cpp
+++ b/src/mongo/util/options_parser/options_parser.cpp
@@ -46,7 +46,6 @@
 #include "mongo/db/json.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/hostandport.h"
 #include "mongo/util/net/http_client.h"
 #include "mongo/util/options_parser/constraints.h"
@@ -55,6 +54,7 @@
 #include "mongo/util/options_parser/option_section.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/shell_exec.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
 namespace mongo {
@@ -724,7 +724,7 @@ Status checkLongName(const po::variables_map& vm,
                  ++keyValueVectorIt) {
                 std::string key;
                 std::string value;
-                if (!mongoutils::str::splitOn(*keyValueVectorIt, '=', key, value)) {
+                if (!str::splitOn(*keyValueVectorIt, '=', key, value)) {
                     StringBuilder sb;
                     sb << "Illegal option assignment: \"" << *keyValueVectorIt << "\"";
                     return Status(ErrorCodes::BadValue, sb.str());
diff --git a/src/mongo/util/perfctr_collect.cpp b/src/mongo/util/perfctr_collect.cpp
index 8ac2c9590c6..5ff3ed41e8b 100644
--- a/src/mongo/util/perfctr_collect.cpp
+++ b/src/mongo/util/perfctr_collect.cpp
@@ -36,8 +36,8 @@
 #include "mongo/base/init.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
 namespace mongo {
diff --git a/src/mongo/util/processinfo_solaris.cpp b/src/mongo/util/processinfo_solaris.cpp
index 3a75aeb6f92..e65357b9ae4 100644
--- a/src/mongo/util/processinfo_solaris.cpp
+++ b/src/mongo/util/processinfo_solaris.cpp
@@ -47,9 +47,9 @@
 
 #include "mongo/util/file.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/processinfo.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
@@ -70,15 +70,14 @@ struct ProcPsinfo {
     ProcPsinfo() {
         FILE* f = fopen("/proc/self/psinfo", "r");
         massert(16846,
-                mongoutils::str::stream() << "couldn't open \"/proc/self/psinfo\": "
-                                          << errnoWithDescription(),
+                str::stream() << "couldn't open \"/proc/self/psinfo\": " << errnoWithDescription(),
                 f);
         size_t num = fread(&psinfo, sizeof(psinfo), 1, f);
         int err = errno;
         fclose(f);
         massert(16847,
-                mongoutils::str::stream() << "couldn't read from \"/proc/self/psinfo\": "
-                                          << errnoWithDescription(err),
+                str::stream() << "couldn't read from \"/proc/self/psinfo\": "
+                              << errnoWithDescription(err),
                 num == 1);
     }
     psinfo_t psinfo;
@@ -88,15 +87,14 @@ struct ProcUsage {
     ProcUsage() {
         FILE* f = fopen("/proc/self/usage", "r");
         massert(16848,
-                mongoutils::str::stream() << "couldn't open \"/proc/self/usage\": "
-                                          << errnoWithDescription(),
+                str::stream() << "couldn't open \"/proc/self/usage\": " << errnoWithDescription(),
                 f);
         size_t num = fread(&prusage, sizeof(prusage), 1, f);
         int err = errno;
         fclose(f);
         massert(16849,
-                mongoutils::str::stream() << "couldn't read from \"/proc/self/usage\": "
-                                          << errnoWithDescription(err),
+                str::stream() << "couldn't read from \"/proc/self/usage\": "
+                              << errnoWithDescription(err),
                 num == 1);
     }
     prusage_t prusage;
@@ -149,13 +147,13 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
     char buf_native[32];
     if (sysinfo(SI_ARCHITECTURE_64, buf_64, sizeof(buf_64)) != -1 &&
         sysinfo(SI_ARCHITECTURE_NATIVE, buf_native, sizeof(buf_native)) != -1) {
-        addrSize = mongoutils::str::equals(buf_64, buf_native) ? 64 : 32;
+        addrSize = str::equals(buf_64, buf_native) ? 64 : 32;
     } else {
         log() << "Unable to determine system architecture: " << strerror(errno);
     }
 
     osType = unameData.sysname;
-    osName = mongoutils::str::ltrim(readLineFromFile("/etc/release"));
+    osName = str::ltrim(readLineFromFile("/etc/release"));
     osVersion = unameData.version;
     pageSize = static_cast<unsigned long long>(sysconf(_SC_PAGESIZE));
     memSize = pageSize * static_cast<unsigned long long>(sysconf(_SC_PHYS_PAGES));
@@ -169,7 +167,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
     // 2. Illumos kernel releases (which is all non Oracle Solaris releases)
     preferMsyncOverFSync = false;
 
-    if (mongoutils::str::startsWith(osName, "Oracle Solaris")) {
+    if (str::startsWith(osName, "Oracle Solaris")) {
         std::vector<std::string> versionComponents;
         splitStringDelim(osVersion, &versionComponents, '.');
 
diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp
index 0aec03be8b3..8e6b203da12 100644
--- a/src/mongo/util/procparser.cpp
+++ b/src/mongo/util/procparser.cpp
@@ -51,8 +51,8 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 namespace mongo {
 
diff --git a/src/mongo/util/regex_util.cpp b/src/mongo/util/regex_util.cpp
index c60a7dc8847..e22cb2b1a97 100644
--- a/src/mongo/util/regex_util.cpp
+++ b/src/mongo/util/regex_util.cpp
@@ -31,7 +31,7 @@
 #include "mongo/util/regex_util.h"
 
 #include "mongo/base/error_codes.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 namespace regex_util {
diff --git a/src/mongo/util/shell_exec.cpp b/src/mongo/util/shell_exec.cpp
index 09cf48cad34..1adc02dbd4f 100644
--- a/src/mongo/util/shell_exec.cpp
+++ b/src/mongo/util/shell_exec.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #include "mongo/util/errno_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/text.h"
 #include "mongo/util/time_support.h"
 
diff --git a/src/mongo/util/signal_win32.cpp b/src/mongo/util/signal_win32.cpp
index 132c71fc018..3f4163c514a 100644
--- a/src/mongo/util/signal_win32.cpp
+++ b/src/mongo/util/signal_win32.cpp
@@ -29,7 +29,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include <string>
 
 namespace mongo {
@@ -39,7 +39,7 @@ namespace mongo {
 std::string getShutdownSignalName(int processId) {
     const char* strEventNamePrefix = "Global\\Mongo_";
 
-    return mongoutils::str::stream() << strEventNamePrefix << processId;
+    return str::stream() << strEventNamePrefix << processId;
 }
 #endif
 }
diff --git a/src/mongo/util/mongoutils/str.h b/src/mongo/util/str.h
index b26b16f8e01..f7b5c2925f0 100644
--- a/src/mongo/util/mongoutils/str.h
+++ b/src/mongo/util/str.h
@@ -33,7 +33,6 @@
  * String utilities.
  *
  * TODO: De-inline.
- * TODO: Retire the mongoutils namespace, and move str under the mongo namespace.
  */
 
 #include <sstream>
@@ -42,9 +41,7 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/util/builder.h"
 
-namespace mongoutils {
-
-namespace str {
+namespace mongo::str {
 
 /** the idea here is to make one liners easy.  e.g.:
 
@@ -269,17 +266,12 @@ inline size_t lengthInUTF8CodePoints(mongo::StringData str) {
     return strLen;
 }
 
-}  // namespace str
-
-}  // namespace mongoutils
-
-namespace mongo {
-using namespace mongoutils;
-
+inline int caseInsensitiveCompare(const char* s1, const char* s2) {
 #if defined(_WIN32)
-inline int strcasecmp(const char* s1, const char* s2) {
     return _stricmp(s1, s2);
-}
+#else
+    return strcasecmp(s1, s2);
 #endif
+}
 
-}  // namespace mongo
+}  // namespace mongo::str
diff --git a/src/mongo/util/stringutils.h b/src/mongo/util/stringutils.h
index 52ef1675e2a..dc9110fc112 100644
--- a/src/mongo/util/stringutils.h
+++ b/src/mongo/util/stringutils.h
@@ -40,7 +40,7 @@
 
 namespace mongo {
 
-// see also mongoutils/str.h - perhaps move these there?
+// see also mongo/util/str.h - perhaps move these there?
 // see also text.h
 
 void splitStringDelim(const std::string& str, std::vector<std::string>* res, char delim);
diff --git a/src/mongo/util/tcmalloc_set_parameter.cpp b/src/mongo/util/tcmalloc_set_parameter.cpp
index 179d717fafa..8fa4a5f0c37 100644
--- a/src/mongo/util/tcmalloc_set_parameter.cpp
+++ b/src/mongo/util/tcmalloc_set_parameter.cpp
@@ -42,8 +42,8 @@
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/util/mongoutils/str.h"
 #include "mongo/util/processinfo.h"
+#include "mongo/util/str.h"
 #include "mongo/util/tcmalloc_parameters_gen.h"
 
 namespace mongo {
diff --git a/src/mongo/util/text.cpp b/src/mongo/util/text.cpp
index 67340215814..df084ac1bae 100644
--- a/src/mongo/util/text.cpp
+++ b/src/mongo/util/text.cpp
@@ -43,7 +43,7 @@
 
 #include "mongo/platform/basic.h"
 #include "mongo/util/allocator.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace mongo {
 
@@ -173,7 +173,7 @@ std::string toUtf8String(const std::wstring& wide) {
         }
     }
 
-    msgasserted(16091, mongoutils::str::stream() << "can't wstring to utf8: " << ::GetLastError());
+    msgasserted(16091, str::stream() << "can't wstring to utf8: " << ::GetLastError());
     return "";
 }
 
diff --git a/src/mongo/util/time_support.cpp b/src/mongo/util/time_support.cpp
index 4f34ecab195..079f72fa741 100644
--- a/src/mongo/util/time_support.cpp
+++ b/src/mongo/util/time_support.cpp
@@ -41,7 +41,7 @@
 #include "mongo/bson/util/builder.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 #if defined(_WIN32)
 #include "mongo/util/concurrency/mutex.h"