1 files changed, 31 insertions, 15 deletions

diff --git a/framework/src/errors.h b/framework/src/errors.h
index f6c6cfab..9c48f32a 100644
--- a/framework/src/errors.h
+++ b/framework/src/errors.h
@@ -20,9 +20,13 @@ public:
 
     // For implicit conversions when doing makeUnexpected(other)
     template <typename Other>
-    constexpr explicit Unexpected(const Unexpected<Other> &error) : mValue(error.value()) {}
+    constexpr explicit Unexpected(const Unexpected<Other> &error) : mValue(error.value())
+    {
+    }
     template <typename Other>
-    constexpr explicit Unexpected(Unexpected<Other> &&error) : mValue(std::move(error.value())) {}
+    constexpr explicit Unexpected(Unexpected<Other> &&error) : mValue(std::move(error.value()))
+    {
+    }
 
     constexpr const Error &value() const &
     {
@@ -82,7 +86,7 @@ protected:
 
     constexpr void copyPartFromOther(const StorageBase &other)
     {
-        if (isValue) {
+        if (mIsValue) {
             mValue = other.mValue;
         } else {
             mError = other.mError;
@@ -91,40 +95,40 @@ protected:
 
     void movePartFromOther(StorageBase &&other)
     {
-        if (isValue) {
+        if (mIsValue) {
             mValue = std::move(other.mValue);
         } else {
             mError = std::move(other.mError);
         }
     }
 
-    StorageBase(const StorageBase &other) : isValue(other.isValue)
+    StorageBase(const StorageBase &other) : mIsValue(other.mIsValue)
     {
         copyPartFromOther(other);
     }
 
-    StorageBase(StorageBase &&other) : isValue(other.isValue)
+    StorageBase(StorageBase &&other) : mIsValue(other.mIsValue)
     {
         movePartFromOther(std::move(other));
     }
 
     constexpr StorageBase &operator=(const StorageBase &other)
     {
-        isValue = other.isValue;
+        mIsValue = other.mIsValue;
         copyPartFromOther(other);
         return *this;
     }
 
     constexpr StorageBase &operator=(StorageBase &&other)
     {
-        isValue = other.isValue;
+        mIsValue = other.mIsValue;
         movePartFromOther(other);
         return *this;
     }
 
     ~StorageBase()
     {
-        if (isValue) {
+        if (mIsValue) {
             mValue.~Type();
         } else {
             mError.~Unexpected<Error>();
@@ -135,13 +139,13 @@ protected:
 
     template <typename... Args>
     constexpr StorageBase(tags::Expected, Args &&... args)
-        : mValue(std::forward<Args>(args)...), isValue(true)
+        : mValue(std::forward<Args>(args)...), mIsValue(true)
     {
     }
 
     template <typename... Args>
     constexpr StorageBase(tags::Unexpected, Args &&... args)
-        : mError(std::forward<Args>(args)...), isValue(false)
+        : mError(std::forward<Args>(args)...), mIsValue(false)
     {
     }
 
@@ -150,7 +154,7 @@ protected:
         Unexpected<Error> mError;
         Type mValue;
     };
-    bool isValue;
+    bool mIsValue;
 };
 
 // Write functions here when storage related and when Type == void
@@ -158,16 +162,16 @@ template <typename Error>
 struct StorageBase<Error, void>
 {
 protected:
-    constexpr StorageBase(tags::Expected) : isValue(true) {}
+    constexpr StorageBase(tags::Expected) : mIsValue(true) {}
 
     template <typename... Args>
     constexpr StorageBase(tags::Unexpected, Args &&... args)
-        : mError(std::forward<Args>(args)...), isValue(false)
+        : mError(std::forward<Args>(args)...), mIsValue(false)
     {
     }
 
     Unexpected<Error> mError;
-    bool isValue;
+    bool mIsValue;
 };
 
 // Write functions here when storage related, whether Type is void or not
@@ -205,8 +209,11 @@ struct ExpectedBase : detail::Storage<Error, Type>
     {
     }
 
+    // Warning: will crash if this is an error. You should always check this is
+    // an expected value before calling `.value()`
     constexpr const Type &value() const &
     {
+        Q_ASSERT(this->mIsValue);
         return this->mValue;
     }
 };
@@ -243,4 +250,13 @@ public:
     {
         return this->mError.value();
     }
+
+    constexpr bool isValue() const
+    {
+        return this->mIsValue;
+    }
+    constexpr explicit operator bool() const
+    {
+        return this->mIsValue;
+    }
 };