SERVER-40476 merge contents of utils/stringutils into utils/str.

9 files changed, 10 insertions, 22 deletions

diff --git a/src/mongo/db/fts/fts_basic_tokenizer.cpp b/src/mongo/db/fts/fts_basic_tokenizer.cpp
index 0a46b562955..a7dab749790 100644
--- a/src/mongo/db/fts/fts_basic_tokenizer.cpp
+++ b/src/mongo/db/fts/fts_basic_tokenizer.cpp
@@ -38,7 +38,6 @@
 #include "mongo/db/fts/tokenizer.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 namespace fts {
@@ -69,7 +68,7 @@ bool BasicFTSTokenizer::moveNext() {
             continue;
         }
 
-        string word = tolowerString(token.data);
+        string word = str::toLower(token.data);
 
         // Stop words are case-sensitive so we need them to be lower cased to check
         // against the stop word list
diff --git a/src/mongo/db/fts/fts_element_iterator.cpp b/src/mongo/db/fts/fts_element_iterator.cpp
index 7589904c56e..ebca711dd2b 100644
--- a/src/mongo/db/fts/fts_element_iterator.cpp
+++ b/src/mongo/db/fts/fts_element_iterator.cpp
@@ -31,7 +31,6 @@
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/db/fts/fts_util.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 #include <stack>
 
diff --git a/src/mongo/db/fts/fts_language.cpp b/src/mongo/db/fts/fts_language.cpp
index 518c8a8e9f4..faa54e79333 100644
--- a/src/mongo/db/fts/fts_language.cpp
+++ b/src/mongo/db/fts/fts_language.cpp
@@ -40,7 +40,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/fts/fts_query_impl.cpp b/src/mongo/db/fts/fts_query_impl.cpp
index 4fc03b24746..fffc4362fbb 100644
--- a/src/mongo/db/fts/fts_query_impl.cpp
+++ b/src/mongo/db/fts/fts_query_impl.cpp
@@ -36,7 +36,6 @@
 #include "mongo/db/fts/fts_tokenizer.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/fts/fts_query_parser.cpp b/src/mongo/db/fts/fts_query_parser.cpp
index 4d86580374b..a346e03451b 100644
--- a/src/mongo/db/fts/fts_query_parser.cpp
+++ b/src/mongo/db/fts/fts_query_parser.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/db/fts/fts_query_parser.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/fts/fts_spec.cpp b/src/mongo/db/fts/fts_spec.cpp
index ec320a562f6..20560ccdad5 100644
--- a/src/mongo/db/fts/fts_spec.cpp
+++ b/src/mongo/db/fts/fts_spec.cpp
@@ -38,7 +38,6 @@
 #include "mongo/db/fts/fts_util.h"
 #include "mongo/db/matcher/expression_parser.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/fts/fts_spec_legacy.cpp b/src/mongo/db/fts/fts_spec_legacy.cpp
index b5e61b2f535..53169f5e213 100644
--- a/src/mongo/db/fts/fts_spec_legacy.cpp
+++ b/src/mongo/db/fts/fts_spec_legacy.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/db/bson/dotted_path_support.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
@@ -42,9 +41,6 @@ namespace fts {
 // text indexes.
 //
 
-using std::map;
-using std::string;
-
 namespace dps = ::mongo::dotted_path_support;
 
 namespace {
@@ -81,7 +77,7 @@ void FTSSpec::_scoreStringV1(const Tools& tools,
         if (t.type != Token::TEXT)
             continue;
 
-        string term = tolowerString(t.data);
+        std::string term = str::toLower(t.data);
         if (tools.stopwords->isStopWord(term))
             continue;
         term = tools.stemmer->stem(term).toString();
@@ -99,7 +95,7 @@ void FTSSpec::_scoreStringV1(const Tools& tools,
     }
 
     for (ScoreHelperMap::const_iterator i = terms.begin(); i != terms.end(); ++i) {
-        const string& term = i->first;
+        const std::string& term = i->first;
         const ScoreHelperStruct& data = i->second;
 
         // in order to adjust weights as a function of term count as it
@@ -195,7 +191,7 @@ void FTSSpec::_scoreDocumentV1(const BSONObj& obj, TermFrequencyMap* term_freqs)
 }
 
 StatusWith<BSONObj> FTSSpec::_fixSpecV1(const BSONObj& spec) {
-    map<string, int> m;
+    std::map<std::string, int> m;
 
     BSONObj keyPattern;
     {
@@ -240,24 +236,24 @@ StatusWith<BSONObj> FTSSpec::_fixSpecV1(const BSONObj& spec) {
     BSONObj weights;
     {
         BSONObjBuilder b;
-        for (map<string, int>::iterator i = m.begin(); i != m.end(); ++i) {
-            if (i->second <= 0 || i->second >= MAX_WORD_WEIGHT) {
+        for (const auto& kv : m) {
+            if (kv.second <= 0 || kv.second >= MAX_WORD_WEIGHT) {
                 return {ErrorCodes::CannotCreateIndex,
                         str::stream() << "text index weight must be in the exclusive interval (0,"
                                       << MAX_WORD_WEIGHT
                                       << ") but found: "
-                                      << i->second};
+                                      << kv.second};
             }
-            b.append(i->first, i->second);
+            b.append(kv.first, kv.second);
         }
         weights = b.obj();
     }
 
-    string default_language(spec.getStringField("default_language"));
+    std::string default_language(spec.getStringField("default_language"));
     if (default_language.empty())
         default_language = "english";
 
-    string language_override(spec.getStringField("language_override"));
+    std::string language_override(spec.getStringField("language_override"));
     if (language_override.empty())
         language_override = "language";
 
diff --git a/src/mongo/db/fts/fts_unicode_tokenizer.cpp b/src/mongo/db/fts/fts_unicode_tokenizer.cpp
index f4db4881cb5..ab27d3a5c6a 100644
--- a/src/mongo/db/fts/fts_unicode_tokenizer.cpp
+++ b/src/mongo/db/fts/fts_unicode_tokenizer.cpp
@@ -38,7 +38,6 @@
 #include "mongo/db/fts/tokenizer.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {
 namespace fts {
diff --git a/src/mongo/db/fts/tokenizer.cpp b/src/mongo/db/fts/tokenizer.cpp
index 2847f7486a8..3de9eb00689 100644
--- a/src/mongo/db/fts/tokenizer.cpp
+++ b/src/mongo/db/fts/tokenizer.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/db/fts/tokenizer.h"
 #include "mongo/util/str.h"
-#include "mongo/util/stringutils.h"
 
 namespace mongo {