Merge pull request #14267 from jordan-woyak/std-expected

Common: Replace Result with std::expected.

2 files changed, 0 insertions, 37 deletions

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 2961354afb..bed44a540e 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -127,7 +127,6 @@ add_library(common
   QoSSession.h
   Random.cpp
   Random.h
-  Result.h
   ScopeGuard.h
   SDCardUtil.cpp
   SDCardUtil.h
diff --git a/Source/Core/Common/Result.h b/Source/Core/Common/Result.h
deleted file mode 100644
index db80362da1..0000000000
--- a/Source/Core/Common/Result.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2018 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <variant>
-
-namespace Common
-{
-template <typename Expected, typename Unexpected>
-class Result final
-{
-public:
-  constexpr Result(const Expected& value) : m_variant{value} {}
-  constexpr Result(Expected&& value) : m_variant{std::move(value)} {}
-
-  constexpr Result(const Unexpected& value) : m_variant{value} {}
-  constexpr Result(Unexpected&& value) : m_variant{std::move(value)} {}
-
-  constexpr explicit operator bool() const { return Succeeded(); }
-  constexpr bool Succeeded() const { return std::holds_alternative<Expected>(m_variant); }
-
-  // Must only be called when Succeeded() returns true.
-  constexpr const Expected& operator*() const { return std::get<Expected>(m_variant); }
-  constexpr const Expected* operator->() const { return &std::get<Expected>(m_variant); }
-  constexpr Expected& operator*() { return std::get<Expected>(m_variant); }
-  constexpr Expected* operator->() { return &std::get<Expected>(m_variant); }
-
-  // Must only be called when Succeeded() returns false.
-  constexpr Unexpected& Error() { return std::get<Unexpected>(m_variant); }
-  constexpr const Unexpected& Error() const { return std::get<Unexpected>(m_variant); }
-
-private:
-  std::variant<Expected, Unexpected> m_variant;
-};
-}  // namespace Common