Bug 1738840 - Replaces mozilla::Tuple with std::tuple in accessible/ r=emilio

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

accessible/base/NotificationController.h

@@ -79,12 +79,12 @@ class TNotification : public Notification {
 
   template <size_t... Indices>
   void ProcessHelper(std::index_sequence<Indices...>) {
-    (mInstance->*mCallback)(Get<Indices>(mArgs)...);
+    (mInstance->*mCallback)(std::get<Indices>(mArgs)...);
   }
 
   Class* mInstance;
   Callback mCallback;
-  Tuple<RefPtr<Args>...> mArgs;
+  std::tuple<RefPtr<Args>...> mArgs;
 };
 
 /**

accessible/windows/msaa/Platform.cpp

@@ -26,6 +26,8 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 
+#include <tuple>
+
 #if defined(MOZ_TELEMETRY_REPORTING)
 #  include "mozilla/Telemetry.h"
 #endif  // defined(MOZ_TELEMETRY_REPORTING)
@@ -256,8 +258,7 @@ static void AppendVersionInfo(nsIFile* aClientExe, nsAString& aStrToAppend) {
     return;
   }
 
-  uint16_t major, minor, patch, build;
-  Tie(major, minor, patch, build) = version.unwrap().AsTuple();
+  auto [major, minor, patch, build] = version.unwrap().AsTuple();
 
   aStrToAppend.AppendLiteral(u"|");
 

toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp

@@ -74,9 +74,7 @@ static bool AddLengthLimitedStringProp(JSContext* cx, JS::HandleObject aObj,
 
 static JSString* ModuleVersionToJSString(JSContext* aCx,
                                          const ModuleVersion& aVersion) {
-  uint16_t major, minor, patch, build;
-
-  Tie(major, minor, patch, build) = aVersion.AsTuple();
+  auto [major, minor, patch, build] = aVersion.AsTuple();
 
   constexpr auto dot = u"."_ns;
 

widget/windows/WinHeaderOnlyUtils.h

@@ -12,15 +12,14 @@
 #include <winnt.h>
 #include <winternl.h>
 #include <objbase.h>
-
 #include <stdlib.h>
+#include <tuple>
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ResultVariant.h"
-#include "mozilla/Tuple.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsHelpers.h"
@@ -645,13 +644,13 @@ class ModuleVersion final {
 
   operator uint64_t() const { return AsInteger(); }
 
-  Tuple<uint16_t, uint16_t, uint16_t, uint16_t> AsTuple() const {
+  std::tuple<uint16_t, uint16_t, uint16_t, uint16_t> AsTuple() const {
     uint16_t major = static_cast<uint16_t>((mVersion >> 48) & 0xFFFFU);
     uint16_t minor = static_cast<uint16_t>((mVersion >> 32) & 0xFFFFU);
     uint16_t patch = static_cast<uint16_t>((mVersion >> 16) & 0xFFFFU);
     uint16_t build = static_cast<uint16_t>(mVersion & 0xFFFFU);
 
-    return MakeTuple(major, minor, patch, build);
+    return {major, minor, patch, build};
   }
 
   explicit operator bool() const { return !!mVersion; }