Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 3 deletions

diff --git a/src/mongo/shell/linenoise.cpp b/src/mongo/shell/linenoise.cpp
index d62082aa089..679578d133b 100644
--- a/src/mongo/shell/linenoise.cpp
+++ b/src/mongo/shell/linenoise.cpp
@@ -119,7 +119,6 @@
 #include <string>
 #include <vector>
 
-#include "mongo/base/data_view.h"
 #include "mongo/util/errno_util.h"
 
 using std::string;
@@ -353,7 +352,7 @@ public:
         }
         Utf32String killedText(text, textLen);
         if (lastAction == actionKill && size > 0) {
-            int slot = mongo::ConstDataView(&indexToSlot[0]).read<uint8_t>();
+            int slot = indexToSlot[0];
             int currentLen = theRing[slot].length();
             int resultLen = currentLen + textLen;
             Utf32String temp(resultLen + 1);
@@ -376,7 +375,7 @@ public:
                 size++;
                 theRing.push_back(killedText);
             } else {
-                int slot = mongo::ConstDataView(&indexToSlot[capacity - 1]).read<uint8_t>();
+                int slot = indexToSlot[capacity - 1];
                 theRing[slot] = killedText;
                 memmove(&indexToSlot[1], &indexToSlot[0], capacity - 1);
                 indexToSlot[0] = slot;