Skip to content

Fix -Wreturn-type and -Wunused-parameter warnings in tests. NFC. #98

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix -Wreturn-type and -Wunused-parameter warnings in tests. NFC. #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c148f52
Fix a couple of `-Wreturn-type` warnings in tests. NFC.
Quuxplusone Jan 2, 2022
1ea24d8
Fix `-Wunused-parameter` warnings in tests. NFC.
Quuxplusone Jan 2, 2022
2bca148
Fix a `-Wunused-value` warning in a test. NFC.
Quuxplusone Jan 2, 2022
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
10 changes: 5 additions & 5 deletions tests/bases.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ TEST_CASE("Triviality", "[bases.triviality]") {

{
struct T {
T(const T&){}
T(T&&) {};
T& operator=(const T&) {}
T& operator=(T&&) {};
~T(){}
T(const T&) {}
T(T&&) {}
T& operator=(const T&) { return *this; }
T& operator=(T&&) { return *this; }
~T() {}
};
REQUIRE(!std::is_trivially_copy_constructible<tl::expected<T,int>>::value);
REQUIRE(!std::is_trivially_copy_assignable<tl::expected<T,int>>::value);
Expand Down
18 changes: 8 additions & 10 deletions tests/extensions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

TEST_CASE("Map extensions", "[extensions.map]") {
auto mul2 = [](int a) { return a * 2; };
auto ret_void = [](int a) {};
auto ret_void = [](int) {};

{
tl::expected<int, int> e = 21;
Expand Down Expand Up @@ -143,7 +143,7 @@ TEST_CASE("Map extensions", "[extensions.map]") {

TEST_CASE("Map error extensions", "[extensions.map_error]") {
auto mul2 = [](int a) { return a * 2; };
auto ret_void = [](int a) {};
auto ret_void = [](int) {};

{
tl::expected<int, int> e = 21;
Expand Down Expand Up @@ -252,8 +252,8 @@ TEST_CASE("Map error extensions", "[extensions.map_error]") {
}

TEST_CASE("And then extensions", "[extensions.and_then]") {
auto succeed = [](int a) { return tl::expected<int, int>(21 * 2); };
auto fail = [](int a) { return tl::expected<int, int>(tl::unexpect, 17); };
auto succeed = [](int) { return tl::expected<int, int>(21 * 2); };
auto fail = [](int) { return tl::expected<int, int>(tl::unexpect, 17); };

{
tl::expected<int, int> e = 21;
Expand Down Expand Up @@ -370,9 +370,9 @@ TEST_CASE("And then extensions", "[extensions.and_then]") {

TEST_CASE("or_else", "[extensions.or_else]") {
using eptr = std::unique_ptr<int>;
auto succeed = [](int a) { return tl::expected<int, int>(21 * 2); };
auto succeedptr = [](eptr e) { return tl::expected<int,eptr>(21*2);};
auto fail = [](int a) { return tl::expected<int,int>(tl::unexpect, 17);};
auto succeed = [](int) { return tl::expected<int, int>(21 * 2); };
auto succeedptr = [](eptr) { return tl::expected<int,eptr>(21*2);};
auto fail = [](int) { return tl::expected<int,int>(tl::unexpect, 17);};
auto efail = [](eptr e) { *e = 17;return tl::expected<int,eptr>(tl::unexpect, std::move(e));};
auto failptr = [](eptr e) { return tl::expected<int,eptr>(tl::unexpect, std::move(e));};
auto failvoid = [](int) {};
Expand Down Expand Up @@ -568,9 +568,7 @@ struct F {
TEST_CASE("14", "[issue.14]") {
auto res = tl::expected<S,F>{tl::unexpect, F{}};

res.map_error([](F f) {

});
res.map_error([](F) {});
}

TEST_CASE("32", "[issue.32]") {
Expand Down
6 changes: 3 additions & 3 deletions tests/issues.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ TEST_CASE("Issue 1", "[issues.1]") { getInt1(); }

tl::expected<int, int> operation1() { return 42; }

tl::expected<std::string, int> operation2(int const val) { return "Bananas"; }
tl::expected<std::string, int> operation2(int) { return "Bananas"; }

TEST_CASE("Issue 17", "[issues.17]") {
auto const intermediate_result = operation1();
Expand Down Expand Up @@ -67,7 +67,7 @@ struct i31{
};
TEST_CASE("Issue 31", "[issues.31]") {
const tl::expected<i31, int> a = i31{42};
a->i;
(void) a->i;

tl::expected< void, std::string > result;
tl::expected< void, std::string > result2 = result;
Expand All @@ -77,7 +77,7 @@ TEST_CASE("Issue 31", "[issues.31]") {
TEST_CASE("Issue 33", "[issues.33]") {
tl::expected<void, int> res {tl::unexpect, 0};
REQUIRE(!res);
res = res.map_error([](int i) { return 42; });
res = res.map_error([](int) { return 42; });
REQUIRE(res.error() == 42);
}

Expand Down