mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

AK: Disallow implicitly copying Error and ErrorOr instances

Browse source 
In the rare cases that a copy is actually needed, the Error::copy
factory will suffice.
This commit is contained in:
Timothy Flynn 2023-02-09 13:47:28 -05:00 • committed by Linus Groh
parent 604d5f5bca
commit 8eb3d79129
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
AK/Error.h
View file

@ -21,6 +21,9 @@ namespace AK {
class Error { class Error {
public: public:
ALWAYS_INLINE Error(Error&&) = default;
ALWAYS_INLINE Error& operator=(Error&&) = default;
[[nodiscard]] static Error from_errno(int code) { return Error(code); } [[nodiscard]] static Error from_errno(int code) { return Error(code); }
[[nodiscard]] static Error from_syscall(StringView syscall_name, int rc) { return Error(syscall_name, rc); } [[nodiscard]] static Error from_syscall(StringView syscall_name, int rc) { return Error(syscall_name, rc); }
[[nodiscard]] static Error from_string_view(StringView string_literal) { return Error(string_literal); } [[nodiscard]] static Error from_string_view(StringView string_literal) { return Error(string_literal); }
@ -79,6 +82,9 @@ private:
{ {
} }
Error(Error const&) = default;
Error& operator=(Error const&) = default;
StringView m_string_literal; StringView m_string_literal;
int m_code { 0 }; int m_code { 0 };
bool m_syscall { false }; bool m_syscall { false };
@ -100,23 +106,10 @@ public:
} }
ALWAYS_INLINE ErrorOr(ErrorOr&&) = default; ALWAYS_INLINE ErrorOr(ErrorOr&&) = default;
ALWAYS_INLINE ErrorOr(ErrorOr const&) = default;
ALWAYS_INLINE ErrorOr& operator=(ErrorOr&&) = default; ALWAYS_INLINE ErrorOr& operator=(ErrorOr&&) = default;
ALWAYS_INLINE ErrorOr& operator=(ErrorOr const&) = default;
template<typename U> ErrorOr(ErrorOr const&) = delete;
ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType> const& value) ErrorOr& operator=(ErrorOr const&) = delete;
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; }))
{
}
template<typename U>
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)); }))
{
}
template<typename U> template<typename U>
ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>&& value) ALWAYS_INLINE ErrorOr(ErrorOr<U, ErrorType>&& value)