coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 22:08:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
# Conflicts:
#	test/test_result.cpp
This commit is contained in:
John Wellbelove 2021-09-05 18:10:34 +01:00
commit c399abe166
2 changed files with 12 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/etl/result.h
View File

@ -191,7 +191,7 @@ namespace etl
//*******************************************
TValue&& value()
{
return etl::get<TValue>(etl::move(data));
return etl::move(etl::get<TValue>(etl::move(data)));
}
//*******************************************
@ -209,7 +209,7 @@ namespace etl
//*******************************************
TError&& error()
{
return etl::get<TError>(etl::move(data));
return etl::move(etl::get<TError>(etl::move(data)));
}
private:

80
test/test_result.cpp
View File

@ -46,34 +46,16 @@ namespace
{
}
ValueM(const std::string& v_) : v(v_)
ValueM(const std::string& v_)
: v(v_)
{
}
ValueM(ValueM&& other)
: v(etl::move(other.v))
{
}
ValueM(ValueM&&) = default;
ValueM& operator =(ValueM&&) = default;
ValueM& operator =(ValueM&& rhs)
{
v = etl::move(rhs.v);
return *this;
}
//ValueM(const ValueM&) = delete;
//ValueM& operator =(const ValueM&) = delete;
ValueM(const ValueM& other)
: v(other.v)
{
}
ValueM& operator =(const ValueM& rhs)
{
v = rhs.v;
return *this;
}
ValueM(const ValueM&) = delete;
ValueM& operator =(const ValueM&) = delete;
std::string v;
};
@ -94,27 +76,11 @@ namespace
{
}
ErrorM(ErrorM&& other)
: e(etl::move(other.e))
{
}
ErrorM(ErrorM&& other) = default;
ErrorM& operator =(ErrorM&& rhs) = default;
ErrorM& operator =(ErrorM&& rhs)
{
e = etl::move(rhs.e);
return *this;
}
ErrorM(const ErrorM& other)
: e(other.e)
{
}
ErrorM& operator =(const ErrorM& rhs)
{
e = rhs.e;
return *this;
}
ErrorM(const ErrorM& other) = delete;
ErrorM& operator =(const ErrorM& rhs) = delete;
std::string e;
};
@ -216,19 +182,6 @@ namespace
CHECK(output.v == std::string("value 1"));
}
//*************************************************************************
TEST(test_constructor_for_moveable_const_result_with_value)
{
ValueM input = { "value 1" };
const ResultM result(etl::move(input));
ValueM output = etl::move(result.value());
CHECK(result.is_value());
CHECK(!result.is_error());
CHECK(output.v == std::string("value 1"));
}
//*************************************************************************
TEST(test_constructor_for_result_with_error)
{
@ -268,19 +221,6 @@ namespace
CHECK(output.e == std::string("error 1"));
}
//*************************************************************************
TEST(test_constructor_for_moveable_const_result_with_error)
{
ErrorM input = { "error 1" };
const ResultM result(etl::move(input));
ErrorM output = etl::move(result.error());
CHECK(!result.is_value());
CHECK(result.is_error());
CHECK(output.e == std::string("error 1"));
}
//*************************************************************************
TEST(test_constructor_for_result_void_value_with_error)
{