Bug 1603127 - Replaced mozilla::Tuple with std::tuple and applied structured bindings in mozilla/Encoding.h. r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D129920

Author: ssummar

dom/base/EventSource.cpp

@@ -4,14 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/EventSource.h"
-
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Components.h"
 #include "mozilla/DataMutex.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/dom/EventSource.h"
 #include "mozilla/dom/EventSourceBinding.h"
 #include "mozilla/dom/MessageEvent.h"
 #include "mozilla/dom/MessageEventBinding.h"
@@ -793,7 +792,7 @@ void EventSourceImpl::ParseSegment(const char* aBuffer, uint32_t aLength) {
     uint32_t result;
     size_t read;
     size_t written;
-    Tie(result, read, written, Ignore) =
+    std::tie(result, read, written, std::ignore) =
         mUnicodeDecoder->DecodeToUTF16(src, dst, false);
     for (auto c : dst.To(written)) {
       nsresult rv = ParseCharacter(c);

dom/encoding/TextDecoder.cpp

@@ -9,6 +9,7 @@
 #include "mozilla/Encoding.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsContentUtils.h"
+
 #include <stdint.h>
 
 namespace mozilla::dom {
@@ -64,14 +65,14 @@ void TextDecoder::Decode(Span<const uint8_t> aInput, const bool aStream,
   size_t read;
   size_t written;
   if (mFatal) {
-    Tie(result, read, written) =
+    std::tie(result, read, written) =
         mDecoder->DecodeToUTF16WithoutReplacement(aInput, *output, !aStream);
     if (result != kInputEmpty) {
       aRv.ThrowTypeError<MSG_DOM_DECODING_FAILED>();
       return;
     }
   } else {
-    Tie(result, read, written, Ignore) =
+    std::tie(result, read, written, std::ignore) =
         mDecoder->DecodeToUTF16(aInput, *output, !aStream);
   }
   MOZ_ASSERT(result == kInputEmpty);

dom/file/FileReader.cpp

@@ -474,7 +474,7 @@ nsresult FileReader::GetAsText(Blob* aBlob, const nsACString& aCharset,
 
   auto data = Span(reinterpret_cast<const uint8_t*>(aFileData), aDataLen);
   nsresult rv;
-  Tie(rv, Ignore) = encoding->Decode(data, aResult);
+  std::tie(rv, std::ignore) = encoding->Decode(data, aResult);
   return NS_FAILED(rv) ? rv : NS_OK;
 }
 

dom/html/HTMLFormSubmission.cpp

@@ -5,11 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "HTMLFormSubmission.h"
-
 #include "HTMLFormElement.h"
 #include "HTMLFormSubmissionConstants.h"
 #include "nsCOMPtr.h"
-#include "mozilla/dom/Document.h"
 #include "nsComponentManagerUtils.h"
 #include "nsGkAtoms.h"
 #include "nsIFormControl.h"
@@ -31,12 +29,15 @@
 #include "nsCExternalHandlerService.h"
 #include "nsContentUtils.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/AncestorIterator.h"
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/RandomNum.h"
 
+#include <tuple>
+
 namespace mozilla::dom {
 
 namespace {
@@ -716,7 +717,7 @@ nsresult EncodingFormSubmission::EncodeVal(const nsAString& aStr,
                                            nsCString& aOut,
                                            EncodeType aEncodeType) {
   nsresult rv;
-  Tie(rv, Ignore) = mEncoding->Encode(aStr, aOut);
+  std::tie(rv, std::ignore) = mEncoding->Encode(aStr, aOut);
   if (NS_FAILED(rv)) {
     return rv;
   }

dom/indexedDB/ActorsChild.cpp

@@ -4,10 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "ActorsChild.h"
-
 #include <type_traits>
 
+#include "ActorsChild.h"
 #include "BackgroundChildImpl.h"
 #include "IDBDatabase.h"
 #include "IDBEvents.h"
@@ -901,7 +900,7 @@ nsresult GetFileHandleResult(const RefPtr<IDBFileRequest>& aFileRequest,
   }
 
   nsString tmpString;
-  Tie(rv, Ignore) = encoding->Decode(data, tmpString);
+  std::tie(rv, std::ignore) = encoding->Decode(data, tmpString);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR;
   }

dom/script/ScriptDecoding.h

@@ -13,9 +13,7 @@
 #include "mozilla/CheckedInt.h"  // mozilla::CheckedInt
 #include "mozilla/Encoding.h"    // mozilla::Decoder
 #include "mozilla/Span.h"        // mozilla::Span
-#include "mozilla/Tuple.h"       // mozilla::Tie
 #include "mozilla/UniquePtr.h"   // mozilla::UniquePtr
-#include "mozilla/Unused.h"      // mozilla::Unused
 
 #include <stddef.h>     // size_t
 #include <stdint.h>     // uint8_t, uint32_t
@@ -44,7 +42,7 @@ struct ScriptDecoding<char16_t> {
     uint32_t result;
     size_t read;
     size_t written;
-    Tie(result, read, written, Ignore) =
+    std::tie(result, read, written, std::ignore) =
         aDecoder->DecodeToUTF16(aSrc, aDest, aEndOfSource);
     MOZ_ASSERT(result == kInputEmpty);
     MOZ_ASSERT(read == aSrc.Length());
@@ -76,7 +74,7 @@ struct ScriptDecoding<Utf8Unit> {
     // twos-complement is mandated, we have to play fast and loose and *hope*
     // interpreting memory storing |uint8_t| as |char| will pick up the desired
     // wrapped-around value.  ¯\_(ツ)_/¯
-    Tie(result, read, written, Ignore) =
+    std::tie(result, read, written, std::ignore) =
         aDecoder->DecodeToUTF8(aSrc, AsWritableBytes(aDest), aEndOfSource);
     MOZ_ASSERT(result == kInputEmpty);
     MOZ_ASSERT(read == aSrc.Length());

dom/script/ScriptLoadHandler.cpp

@@ -19,7 +19,6 @@
 #include "mozilla/NotNull.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/Tuple.h"
 #include "mozilla/Utf8.h"
 #include "mozilla/Vector.h"
 #include "mozilla/dom/Document.h"
@@ -197,7 +196,7 @@ bool ScriptLoadHandler::TrySetDecoder(nsIIncrementalStreamLoader* aLoader,
 
   // Do BOM detection.
   const Encoding* encoding;
-  Tie(encoding, Ignore) = Encoding::ForBOM(Span(aData, aDataLength));
+  std::tie(encoding, std::ignore) = Encoding::ForBOM(Span(aData, aDataLength));
   if (encoding) {
     mDecoder = encoding->NewDecoderWithBOMRemoval();
     return true;

dom/script/ScriptLoader.cpp

@@ -3724,7 +3724,7 @@ static nsresult ConvertToUnicode(nsIChannel* aChannel, const uint8_t* aData,
   UniquePtr<Decoder> unicodeDecoder;
 
   const Encoding* encoding;
-  Tie(encoding, Ignore) = Encoding::ForBOM(data);
+  std::tie(encoding, std::ignore) = Encoding::ForBOM(data);
   if (encoding) {
     unicodeDecoder = encoding->NewDecoderWithBOMRemoval();
   }

dom/serializers/nsDocumentEncoder.cpp

@@ -9,17 +9,14 @@
  * to strings in a gazillion different ways.
  */
 
-#include "nsIDocumentEncoder.h"
-
 #include <utility>
 
 #include "nscore.h"
 #include "nsISupports.h"
-#include "mozilla/dom/Document.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include "nsIContentSerializer.h"
-#include "mozilla/Encoding.h"
+#include "nsIDocumentEncoder.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIOutputStream.h"
 #include "nsRange.h"
@@ -36,15 +33,17 @@
 #include "nsReadableUtils.h"
 #include "nsTArray.h"
 #include "nsIFrame.h"
+#include "nsLayoutUtils.h"
 #include "nsStringBuffer.h"
 #include "mozilla/dom/Comment.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLBRElement.h"
 #include "mozilla/dom/ProcessingInstruction.h"
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/dom/Text.h"
-#include "nsLayoutUtils.h"
+#include "mozilla/Encoding.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/UniquePtr.h"
@@ -125,7 +124,7 @@ nsresult TextStreamer::EncodeAndWrite() {
     size_t read;
     size_t written;
     if (mIsPlainText) {
-      Tie(result, read, written) =
+      std::tie(result, read, written) =
           mUnicodeEncoder->EncodeFromUTF16WithoutReplacement(src, dst, false);
       if (result != kInputEmpty && result != kOutputFull) {
         // There's always room for one byte in the case of
@@ -134,7 +133,7 @@ nsresult TextStreamer::EncodeAndWrite() {
         dst[written++] = '?';
       }
     } else {
-      Tie(result, read, written, Ignore) =
+      std::tie(result, read, written, std::ignore) =
           mUnicodeEncoder->EncodeFromUTF16(src, dst, false);
     }
     src = src.From(read);

dom/serviceworkers/ServiceWorkerEvents.cpp

@@ -1018,7 +1018,8 @@ nsresult ExtractBytesFromUSVString(const nsAString& aStr,
   uint32_t result;
   size_t read;
   size_t written;
-  Tie(result, read, written) =
+  // Do not use structured binding lest deal with [-Werror=unused-variable]
+  std::tie(result, read, written) =
       encoder->EncodeFromUTF16WithoutReplacement(aStr, aBytes, true);
   MOZ_ASSERT(result == kInputEmpty);
   MOZ_ASSERT(read == aStr.Length());