SERVER-35691 Merge the stale_config library together with common_s

1 files changed, 8 insertions, 4 deletions

diff --git a/src/mongo/s/cannot_implicitly_create_collection_info.cpp b/src/mongo/s/cannot_implicitly_create_collection_info.cpp
index 5beb1701e85..76e00664adf 100644
--- a/src/mongo/s/cannot_implicitly_create_collection_info.cpp
+++ b/src/mongo/s/cannot_implicitly_create_collection_info.cpp
@@ -26,24 +26,28 @@
  *    it in the license file.
  */
 
-#include <mongo/platform/basic.h>
+#include "mongo/platform/basic.h"
 
 #include "mongo/s/cannot_implicitly_create_collection_info.h"
 
 #include "mongo/base/init.h"
+#include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/util/assert_util.h"
 
 namespace mongo {
+namespace {
 
 MONGO_INIT_REGISTER_ERROR_EXTRA_INFO(CannotImplicitlyCreateCollectionInfo);
 
+}  // namespace
+
 void CannotImplicitlyCreateCollectionInfo::serialize(BSONObjBuilder* bob) const {
-    bob->append("ns", _ns.ns());
+    bob->append("ns", _nss.ns());
 }
 
 std::shared_ptr<const ErrorExtraInfo> CannotImplicitlyCreateCollectionInfo::parse(
     const BSONObj& obj) {
-    NamespaceString ns(obj["ns"].str());
-    return std::make_shared<CannotImplicitlyCreateCollectionInfo>(std::move(ns));
+    return std::make_shared<CannotImplicitlyCreateCollectionInfo>(NamespaceString(obj["ns"].str()));
 }
 
 }  // namespace mongo