15 files changed, 34 insertions, 35 deletions
diff --git a/src/mongo/executor/async_timer_interface.h b/src/mongo/executor/async_timer_interface.h
index d57cac90bf0..e70b5b23699 100644
--- a/src/mongo/executor/async_timer_interface.h
+++ b/src/mongo/executor/async_timer_interface.h
@@ -29,9 +29,9 @@
 
 #pragma once
 
+#include <functional>
 #include <system_error>
 
-#include "mongo/stdx/functional.h"
 #include "mongo/util/time_support.h"
 
 namespace mongo {
@@ -47,7 +47,7 @@ class AsyncTimerInterface {
 public:
     virtual ~AsyncTimerInterface() = default;
 
-    using Handler = stdx::function<void(std::error_code)>;
+    using Handler = std::function<void(std::error_code)>;
 
     /**
      * Cancel any asynchronous operations waiting on this timer, invoking
diff --git a/src/mongo/executor/connection_pool.cpp b/src/mongo/executor/connection_pool.cpp
index 3c4454110c4..e55f9830394 100644
--- a/src/mongo/executor/connection_pool.cpp
+++ b/src/mongo/executor/connection_pool.cpp
@@ -183,8 +183,8 @@ public:
     /**
      * Atomically manipulate the tags in the pool
      */
-    void mutateTags(const stdx::function<transport::Session::TagMask(transport::Session::TagMask)>&
-                        mutateFunc) {
+    void mutateTags(
+        const std::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc) {
         _tags = mutateFunc(_tags);
     }
 
@@ -365,7 +365,7 @@ void ConnectionPool::dropConnections(transport::Session::TagMask tags) {
 
 void ConnectionPool::mutateTags(
     const HostAndPort& hostAndPort,
-    const stdx::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc) {
+    const std::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc) {
     stdx::lock_guard lk(_mutex);
 
     auto iter = _pools.find(hostAndPort);
diff --git a/src/mongo/executor/connection_pool.h b/src/mongo/executor/connection_pool.h
index 9fb22e2c71e..340d36b2145 100644
--- a/src/mongo/executor/connection_pool.h
+++ b/src/mongo/executor/connection_pool.h
@@ -29,12 +29,12 @@
 
 #pragma once
 
+#include <functional>
 #include <memory>
 #include <queue>
 
 #include "mongo/executor/egress_tag_closer.h"
 #include "mongo/executor/egress_tag_closer_manager.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/stdx/unordered_map.h"
 #include "mongo/transport/session.h"
@@ -70,7 +70,7 @@ public:
     class DependentTypeFactoryInterface;
     class TimerInterface;
 
-    using ConnectionHandleDeleter = stdx::function<void(ConnectionInterface* connection)>;
+    using ConnectionHandleDeleter = std::function<void(ConnectionInterface* connection)>;
     using ConnectionHandle = std::unique_ptr<ConnectionInterface, ConnectionHandleDeleter>;
 
     using GetConnectionCallback = unique_function<void(StatusWith<ConnectionHandle>)>;
@@ -152,7 +152,7 @@ public:
     void dropConnections(transport::Session::TagMask tags) override;
 
     void mutateTags(const HostAndPort& hostAndPort,
-                    const stdx::function<transport::Session::TagMask(transport::Session::TagMask)>&
+                    const std::function<transport::Session::TagMask(transport::Session::TagMask)>&
                         mutateFunc) override;
 
     SemiFuture<ConnectionHandle> get(const HostAndPort& hostAndPort,
@@ -194,7 +194,7 @@ class ConnectionPool::TimerInterface {
 public:
     TimerInterface() = default;
 
-    using TimeoutCallback = stdx::function<void()>;
+    using TimeoutCallback = std::function<void()>;
 
     virtual ~TimerInterface() = default;
 
diff --git a/src/mongo/executor/egress_tag_closer.h b/src/mongo/executor/egress_tag_closer.h
index 62448950c0e..b1ab2430ed6 100644
--- a/src/mongo/executor/egress_tag_closer.h
+++ b/src/mongo/executor/egress_tag_closer.h
@@ -29,7 +29,8 @@
 
 #pragma once
 
-#include "mongo/stdx/functional.h"
+#include <functional>
+
 #include "mongo/transport/session.h"
 #include "mongo/util/net/hostandport.h"
 
@@ -50,7 +51,7 @@ public:
     virtual void dropConnections(const HostAndPort& hostAndPort) = 0;
 
     virtual void mutateTags(const HostAndPort& hostAndPort,
-                            const stdx::function<transport::Session::TagMask(
+                            const std::function<transport::Session::TagMask(
                                 transport::Session::TagMask)>& mutateFunc) = 0;
 
 protected:
diff --git a/src/mongo/executor/egress_tag_closer_manager.cpp b/src/mongo/executor/egress_tag_closer_manager.cpp
index 5ec544843f5..fa78a74e183 100644
--- a/src/mongo/executor/egress_tag_closer_manager.cpp
+++ b/src/mongo/executor/egress_tag_closer_manager.cpp
@@ -77,7 +77,7 @@ void EgressTagCloserManager::dropConnections(const HostAndPort& hostAndPort) {
 
 void EgressTagCloserManager::mutateTags(
     const HostAndPort& hostAndPort,
-    const stdx::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc) {
+    const std::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc) {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
 
     for (auto etc : _egressTagClosers) {
diff --git a/src/mongo/executor/egress_tag_closer_manager.h b/src/mongo/executor/egress_tag_closer_manager.h
index 0899b915389..418658dc430 100644
--- a/src/mongo/executor/egress_tag_closer_manager.h
+++ b/src/mongo/executor/egress_tag_closer_manager.h
@@ -29,9 +29,10 @@
 
 #pragma once
 
+#include <functional>
+
 #include "mongo/db/service_context.h"
 #include "mongo/executor/egress_tag_closer.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/transport/session.h"
@@ -61,7 +62,7 @@ public:
 
     void mutateTags(
         const HostAndPort& hostAndPort,
-        const stdx::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc);
+        const std::function<transport::Session::TagMask(transport::Session::TagMask)>& mutateFunc);
 
 private:
     stdx::mutex _mutex;
diff --git a/src/mongo/executor/network_interface.h b/src/mongo/executor/network_interface.h
index 8bc864e3df6..6f938efb3a1 100644
--- a/src/mongo/executor/network_interface.h
+++ b/src/mongo/executor/network_interface.h
@@ -30,10 +30,10 @@
 #pragma once
 
 #include <boost/optional.hpp>
+#include <functional>
 #include <string>
 
 #include "mongo/executor/task_executor.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/transport/baton.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/functional.h"
diff --git a/src/mongo/executor/network_interface_integration_fixture.h b/src/mongo/executor/network_interface_integration_fixture.h
index 704c9b7b124..15c1a9f4361 100644
--- a/src/mongo/executor/network_interface_integration_fixture.h
+++ b/src/mongo/executor/network_interface_integration_fixture.h
@@ -59,7 +59,7 @@ inline TaskExecutor::CallbackHandle makeCallbackHandle() {
     return TaskExecutor::CallbackHandle(std::make_shared<MockCallbackState>());
 }
 
-using StartCommandCB = stdx::function<void(const RemoteCommandResponse&)>;
+using StartCommandCB = std::function<void(const RemoteCommandResponse&)>;
 
 class NetworkInterfaceIntegrationFixture : public mongo::unittest::Test {
 public:
diff --git a/src/mongo/executor/network_interface_mock.cpp b/src/mongo/executor/network_interface_mock.cpp
index 7f156744803..da9aa915b54 100644
--- a/src/mongo/executor/network_interface_mock.cpp
+++ b/src/mongo/executor/network_interface_mock.cpp
@@ -31,14 +31,14 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/executor/network_connection_hook.h"
 #include "mongo/executor/network_interface_mock.h"
 
 #include <algorithm>
+#include <functional>
 #include <iterator>
 
 #include "mongo/executor/connection_pool_stats.h"
-#include "mongo/stdx/functional.h"
+#include "mongo/executor/network_connection_hook.h"
 #include "mongo/util/log.h"
 #include "mongo/util/str.h"
 #include "mongo/util/time_support.h"
diff --git a/src/mongo/executor/network_interface_perf_test.cpp b/src/mongo/executor/network_interface_perf_test.cpp
index 66ad4c596df..29eb7ebb84c 100644
--- a/src/mongo/executor/network_interface_perf_test.cpp
+++ b/src/mongo/executor/network_interface_perf_test.cpp
@@ -72,7 +72,7 @@ int timeNetworkTestMillis(std::size_t operations, NetworkInterface* net) {
 
     // This lambda function is declared here since it is mutually recursive with another callback
     // function
-    stdx::function<void()> func;
+    std::function<void()> func;
 
     const auto bsonObjPing = BSON("ping" << 1);
 
diff --git a/src/mongo/executor/network_test_env.h b/src/mongo/executor/network_test_env.h
index 5125b7b4bd5..25025e39c16 100644
--- a/src/mongo/executor/network_test_env.h
+++ b/src/mongo/executor/network_test_env.h
@@ -29,13 +29,13 @@
 
 #pragma once
 
+#include <functional>
 #include <tuple>
 #include <type_traits>
 #include <vector>
 
 #include "mongo/executor/network_interface_mock.h"
 #include "mongo/executor/task_executor.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/stdx/future.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/unittest/unittest.h"
@@ -157,16 +157,16 @@ public:
             std::move(future), _executor, _mockNetwork};
     }
 
-    using OnCommandFunction = stdx::function<StatusWith<BSONObj>(const RemoteCommandRequest&)>;
+    using OnCommandFunction = std::function<StatusWith<BSONObj>(const RemoteCommandRequest&)>;
     using OnCommandWithMetadataFunction =
-        stdx::function<RemoteCommandResponse(const RemoteCommandRequest&)>;
+        std::function<RemoteCommandResponse(const RemoteCommandRequest&)>;
 
     using OnFindCommandFunction =
-        stdx::function<StatusWith<std::vector<BSONObj>>(const RemoteCommandRequest&)>;
+        std::function<StatusWith<std::vector<BSONObj>>(const RemoteCommandRequest&)>;
     // Function that accepts a find request and returns a tuple of resulting documents and response
     // metadata.
     using OnFindCommandWithMetadataFunction =
-        stdx::function<StatusWith<std::tuple<std::vector<BSONObj>, BSONObj>>(
+        std::function<StatusWith<std::tuple<std::vector<BSONObj>, BSONObj>>(
             const RemoteCommandRequest&)>;
 
     /**
diff --git a/src/mongo/executor/task_executor.h b/src/mongo/executor/task_executor.h
index cb1b2f00cef..92aad54a22a 100644
--- a/src/mongo/executor/task_executor.h
+++ b/src/mongo/executor/task_executor.h
@@ -39,7 +39,6 @@
 #include "mongo/executor/remote_command_request.h"
 #include "mongo/executor/remote_command_response.h"
 #include "mongo/stdx/condition_variable.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/transport/baton.h"
 #include "mongo/util/future.h"
 #include "mongo/util/out_of_line_executor.h"
@@ -106,10 +105,9 @@ public:
      * the BSONObj returned by the command, with the "ok" field indicating the success of the
      * command in the usual way.
      */
-    using RemoteCommandCallbackFn = stdx::function<void(const RemoteCommandCallbackArgs&)>;
+    using RemoteCommandCallbackFn = std::function<void(const RemoteCommandCallbackArgs&)>;
 
-    using RemoteCommandOnAnyCallbackFn =
-        stdx::function<void(const RemoteCommandOnAnyCallbackArgs&)>;
+    using RemoteCommandOnAnyCallbackFn = std::function<void(const RemoteCommandOnAnyCallbackArgs&)>;
 
     /**
      * Destroys the task executor. Implicitly performs the equivalent of shutdown() and join()
diff --git a/src/mongo/executor/task_executor_test_common.cpp b/src/mongo/executor/task_executor_test_common.cpp
index f98e71e5736..cd38281d267 100644
--- a/src/mongo/executor/task_executor_test_common.cpp
+++ b/src/mongo/executor/task_executor_test_common.cpp
@@ -53,7 +53,7 @@ namespace executor {
 namespace {
 
 using ExecutorFactory =
-    stdx::function<std::unique_ptr<TaskExecutor>(std::unique_ptr<NetworkInterfaceMock>)>;
+    std::function<std::unique_ptr<TaskExecutor>(std::unique_ptr<NetworkInterfaceMock>)>;
 
 class CommonTaskExecutorTestFixture : public TaskExecutorTest {
 public:
@@ -70,7 +70,7 @@ private:
 };
 
 using ExecutorTestCaseFactory =
-    stdx::function<std::unique_ptr<CommonTaskExecutorTestFixture>(ExecutorFactory)>;
+    std::function<std::unique_ptr<CommonTaskExecutorTestFixture>(ExecutorFactory)>;
 using ExecutorTestCaseMap = stdx::unordered_map<std::string, ExecutorTestCaseFactory>;
 
 static ExecutorTestCaseMap& executorTestCaseRegistry() {
diff --git a/src/mongo/executor/task_executor_test_common.h b/src/mongo/executor/task_executor_test_common.h
index ba8c9ceb967..1cb87db0422 100644
--- a/src/mongo/executor/task_executor_test_common.h
+++ b/src/mongo/executor/task_executor_test_common.h
@@ -29,11 +29,10 @@
 
 #pragma once
 
+#include <functional>
 #include <memory>
 #include <string>
 
-#include "mongo/stdx/functional.h"
-
 namespace mongo {
 namespace executor {
 
@@ -51,7 +50,7 @@ class TaskExecutor;
  * by value.
  */
 void addTestsForExecutor(const std::string& suiteName,
-                         stdx::function<std::unique_ptr<TaskExecutor>(
+                         std::function<std::unique_ptr<TaskExecutor>(
                              std::unique_ptr<NetworkInterfaceMock>)> makeExecutor);
 
 }  // namespace executor
diff --git a/src/mongo/executor/thread_pool_mock.h b/src/mongo/executor/thread_pool_mock.h
index e3baaa07273..e1f8e30a80f 100644
--- a/src/mongo/executor/thread_pool_mock.h
+++ b/src/mongo/executor/thread_pool_mock.h
@@ -30,10 +30,10 @@
 #pragma once
 
 #include <cstdint>
+#include <functional>
 #include <vector>
 
 #include "mongo/platform/random.h"
-#include "mongo/stdx/functional.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/util/concurrency/thread_pool_interface.h"
@@ -56,7 +56,7 @@ public:
      */
     struct Options {
         // This function is run before the worker thread begins consuming tasks.
-        using OnCreateThreadFn = stdx::function<void()>;
+        using OnCreateThreadFn = std::function<void()>;
         OnCreateThreadFn onCreateThread = []() {};
     };