Skip to content

Simplify result/expected.h #1932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Dec 24, 2025
Merged

Simplify result/expected.h #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions base/cvd/cuttlefish/result/expect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,11 @@ T OutcomeDereference(std::optional<T>&& value) {
return std::move(*value);
}

inline void OutcomeDereference(Result<void>&&) {}

template <typename T>
typename std::conditional_t<std::is_void_v<T>, bool, T> OutcomeDereference(
Result<T>&& result) {
if constexpr (std::is_void<T>::value) {
return result.ok();
} else {
return std::move(*result);
}
T OutcomeDereference(Result<T>&& result) {
return std::move(*result);
}

template <typename T>
Expand All @@ -84,11 +81,6 @@ bool TypeIsSuccess(Result<T>& value) {
return value.ok();
}

template <typename T>
bool TypeIsSuccess(Result<T>&& value) {
return value.ok();
}

inline auto ErrorFromType(bool) { return StackTraceError(); }

template <typename T>
Expand All @@ -101,11 +93,6 @@ auto ErrorFromType(Result<T>& value) {
return value.error();
}

template <typename T>
auto ErrorFromType(Result<T>&& value) {
return value.error();
}

#define CF_EXPECT_OVERLOAD(_1, _2, NAME, ...) NAME

#define CF_EXPECT2(RESULT, MSG) \
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/result/result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

#pragma once

#include "cuttlefish/result/expect.h" // IWYU pragma: export
#include "cuttlefish/result/expect.h" // IWYU pragma: export
#include "cuttlefish/result/result_type.h" // IWYU pragma: export
Loading