feedc0de/expected
1
0
Fork 0
forked from TartanLlama/expected
Code Pull Requests Activity

Fixed issue #129 (#131)

Browse Source 
+ Fixed unused variable warning
+ Added a `std::move` to avoid calling copy-assignment operator on non-copyable types

Co-authored-by: andy-byers <andrew.byers@utdallas.edu>
This commit is contained in:
Andrew Byers
2023-02-15 09:54:16 -06:00
committed by GitHub
parent 79a2068c9a
commit f5e6e9aeed
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/tl/expected.hpp
View File

@@ -208,6 +208,7 @@ template <typename E>
#ifdef TL_EXPECTED_EXCEPTIONS_ENABLED #ifdef TL_EXPECTED_EXCEPTIONS_ENABLED
throw std::forward<E>(e); throw std::forward<E>(e);
#else #else
(void)e;
#ifdef _MSC_VER #ifdef _MSC_VER
__assume(0); __assume(0);
#else #else
@@ -824,7 +825,7 @@ struct expected_operations_base : expected_storage_base<T, E> {
geterr().~unexpected<E>(); geterr().~unexpected<E>();
construct(std::move(rhs).get()); construct(std::move(rhs).get());
} else { } else {
assign_common(rhs); assign_common(std::move(rhs));
} }
} }

8
tests/issues.cpp
View File

@@ -183,4 +183,12 @@ TEST_CASE("Issue 107", "[issues.107]") {
REQUIRE(ex1.error().j == 0); REQUIRE(ex1.error().j == 0);
REQUIRE(ex2.error().i == 2); REQUIRE(ex2.error().i == 2);
REQUIRE(ex2.error().j == 2); REQUIRE(ex2.error().j == 2);
}
TEST_CASE("Issue 129", "[issues.129]") {
tl::expected<std::unique_ptr<int>, int> x1 {std::make_unique<int>(4)};
tl::expected<std::unique_ptr<int>, int> y1 {std::make_unique<int>(2)};
x1 = std::move(y1);
REQUIRE(**x1 == 2);
} }

6
tests/swap.cpp
View File

@@ -14,6 +14,8 @@ struct canthrow_move {
}; };
bool should_throw = false; bool should_throw = false;
#ifdef TL_EXPECTED_EXCEPTIONS_ENABLED
struct willthrow_move { struct willthrow_move {
willthrow_move(std::string i) : i(i) {} willthrow_move(std::string i) : i(i) {}
willthrow_move(willthrow_move const &) = default; willthrow_move(willthrow_move const &) = default;
@@ -24,6 +26,8 @@ struct willthrow_move {
willthrow_move &operator=(willthrow_move &&) = default; willthrow_move &operator=(willthrow_move &&) = default;
std::string i; std::string i;
}; };
#endif // TL_EXPECTED_EXCEPTIONS_ENABLED
static_assert(tl::detail::is_swappable<no_throw>::value, ""); static_assert(tl::detail::is_swappable<no_throw>::value, "");
template <class T1, class T2> void swap_test() { template <class T1, class T2> void swap_test() {
@@ -79,6 +83,7 @@ template <class T1, class T2> void swap_test() {
REQUIRE(b.error().i == s1); REQUIRE(b.error().i == s1);
} }
#ifdef TL_EXPECTED_EXCEPTIONS_ENABLED
TEST_CASE("swap") { TEST_CASE("swap") {
swap_test<no_throw, no_throw>(); swap_test<no_throw, no_throw>();
@@ -99,3 +104,4 @@ TEST_CASE("swap") {
REQUIRE(a->i == s1); REQUIRE(a->i == s1);
REQUIRE(b.error().i == s2); REQUIRE(b.error().i == s2);
} }
#endif // TL_EXPECTED_EXCEPTIONS_ENABLED