diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-05-16 16:54:49 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-05-22 15:23:01 -0700 |
| commit | 9949ec5f5672a839937ed08dfc338494418cdb03 (patch) | |
| tree | e77c38fe273c25da47e3317f1afc92f1ecce97fb /init/rlimit_parser_test.cpp | |
| parent | 691e0e154ad3d666bcd3fb6d21c563700a31ff2f (diff) | |
init: replace Result<> with expected<>
Android-base has an implementation of the future std::expected<>.
This provides the same baseline functionality as Result<>, so use it
instead of our own version.
Bug: 132145659
Test: boot, init unit tests
Change-Id: I11e61bcb5719b262a6420483ed51a762826a9e23
Diffstat (limited to 'init/rlimit_parser_test.cpp')
| -rw-r--r-- | init/rlimit_parser_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/rlimit_parser_test.cpp b/init/rlimit_parser_test.cpp index 659ba8acb..e690bf6d6 100644 --- a/init/rlimit_parser_test.cpp +++ b/init/rlimit_parser_test.cpp @@ -43,8 +43,8 @@ void TestRlimitFailure(std::vector<std::string> input, const std::string& expect auto result = ParseRlimit(input); ASSERT_FALSE(result) << "input: " << input[1]; - EXPECT_EQ(expected_result, result.error_string()); - EXPECT_EQ(0, result.error_errno()); + EXPECT_EQ(expected_result, result.error().as_string); + EXPECT_EQ(0, result.error().as_errno); } TEST(rlimit, RlimitSuccess) { |