system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 04:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Fix constructing ErrorOr from ErrorOr of a related type

Browse source 
Mark other ErrorOr types as friends, and fix a typo in the &&
constructor, so that we can create an ErrorOr<Core::Object> from an
ErrorOr<GUI::Widget>. Also, add some requires() clauses to these
constructors so the error messages are clearer.
This commit is contained in:
Sam Atkins 2022-12-28 20:12:03 +00:00 committed by Tim Flynn
parent 7b0adee487
commit feb0eb9309
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AK/Error.h
View file

@ -81,6 +81,9 @@ private:
template<typename T, typename E> template<typename T, typename E>
class [[nodiscard]] ErrorOr { class [[nodiscard]] ErrorOr {
template<typename U, typename F>
friend class ErrorOr;
public: public:
using ResultType = T; using ResultType = T;
using ErrorType = E; using ErrorType = E;
@ -98,19 +101,22 @@ public:
template<typename U> template<typename U>
ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType> const& value) ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType> const& value)
requires(IsConvertible<U, T>)
: m_value_or_error(value.m_value_or_error.visit([](U const& v) -> Variant<T, ErrorType> { return v; }, [](ErrorType const& error) -> Variant<T, ErrorType> { return error; })) : m_value_or_error(value.m_value_or_error.visit([](U const& v) -> Variant<T, ErrorType> { return v; }, [](ErrorType const& error) -> Variant<T, ErrorType> { return error; }))
{ {
} }
template<typename U> template<typename U>
ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>& value) ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>& value)
requires(IsConvertible<U, T>)
: m_value_or_error(value.m_value_or_error.visit([](U& v) { return Variant<T, ErrorType>(move(v)); }, [](ErrorType& error) { return Variant<T, ErrorType>(move(error)); })) : m_value_or_error(value.m_value_or_error.visit([](U& v) { return Variant<T, ErrorType>(move(v)); }, [](ErrorType& error) { return Variant<T, ErrorType>(move(error)); }))
{ {
} }
template<typename U> template<typename U>
ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>&& value) ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>&& value)
: m_value_or_error(value.visit([](U& v) { return Variant<T, ErrorType>(move(v)); }, [](ErrorType& error) { return Variant<T, ErrorType>(move(error)); })) requires(IsConvertible<U, T>)
: m_value_or_error(value.m_value_or_error.visit([](U& v) { return Variant<T, ErrorType>(move(v)); }, [](ErrorType& error) { return Variant<T, ErrorType>(move(error)); }))
{ {
} }