Skip to content

Commit cecebbb

Browse files
codewizcodewiz
committed
Convert system/core to Result::ok()
No functionality changes, this is a mechanical cleanup. Test: m Test: cd system/core && atest Change-Id: Ifdaa3ce1947ed578f656d5a446978726eb416c36
1 parent a6bc86a commit cecebbb

33 files changed

+240
-233
lines changed

‎base/expected_test.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,11 @@ TEST(Expected, testDereference) {
408408

409409
TEST(Expected, testTest) {
410410
exp_int e = 10;
411-
EXPECT_TRUE(e);
411+
EXPECT_TRUE(e.ok());
412412
EXPECT_TRUE(e.has_value());
413413

414414
exp_int e2 = unexpected(10);
415-
EXPECT_FALSE(e2);
415+
EXPECT_FALSE(e2.ok());
416416
EXPECT_FALSE(e2.has_value());
417417
}
418418

@@ -571,11 +571,11 @@ TEST(Expected, testDivideExample) {
571571
}
572572
};
573573

574-
EXPECT_FALSE(divide(10, 0));
574+
EXPECT_FALSE(divide(10, 0).ok());
575575
EXPECT_EQ("divide by zero", divide(10, 0).error().message);
576576
EXPECT_EQ(-1, divide(10, 0).error().cause);
577577

578-
EXPECT_TRUE(divide(10, 3));
578+
EXPECT_TRUE(divide(10, 3).ok());
579579
EXPECT_EQ(QR(3, 1), *divide(10, 3));
580580
}
581581

@@ -589,7 +589,7 @@ TEST(Expected, testPair) {
589589
};
590590

591591
auto r = test(true);
592-
EXPECT_TRUE(r);
592+
EXPECT_TRUE(r.ok());
593593
EXPECT_EQ("yes", r->first);
594594
}
595595

@@ -603,9 +603,9 @@ TEST(Expected, testVoid) {
603603
};
604604

605605
auto r = test(true);
606-
EXPECT_TRUE(r);
606+
EXPECT_TRUE(r.ok());
607607
r = test(false);
608-
EXPECT_FALSE(r);
608+
EXPECT_FALSE(r.ok());
609609
EXPECT_EQ(10, r.error());
610610
}
611611

@@ -754,7 +754,7 @@ TEST(Expected, testNoCopyOnReturn) {
754754

755755
ConstructorTracker::Reset();
756756
auto result1 = test("");
757-
ASSERT_TRUE(result1);
757+
ASSERT_TRUE(result1.ok());
758758
EXPECT_EQ("literal string", result1->string);
759759
EXPECT_EQ(1U, ConstructorTracker::constructor_called);
760760
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -764,7 +764,7 @@ TEST(Expected, testNoCopyOnReturn) {
764764

765765
ConstructorTracker::Reset();
766766
auto result2 = test("test2");
767-
ASSERT_TRUE(result2);
767+
ASSERT_TRUE(result2.ok());
768768
EXPECT_EQ("test2test22", result2->string);
769769
EXPECT_EQ(1U, ConstructorTracker::constructor_called);
770770
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -774,7 +774,7 @@ TEST(Expected, testNoCopyOnReturn) {
774774

775775
ConstructorTracker::Reset();
776776
auto result3 = test("test3");
777-
ASSERT_TRUE(result3);
777+
ASSERT_TRUE(result3.ok());
778778
EXPECT_EQ("test3 test3", result3->string);
779779
EXPECT_EQ(1U, ConstructorTracker::constructor_called);
780780
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -786,22 +786,22 @@ TEST(Expected, testNoCopyOnReturn) {
786786
TEST(Expected, testNested) {
787787
expected<exp_string, std::string> e = "hello";
788788

789+
EXPECT_TRUE(e.ok());
789790
EXPECT_TRUE(e.has_value());
790791
EXPECT_TRUE(e.value().has_value());
791-
EXPECT_TRUE(e);
792-
EXPECT_TRUE(*e);
792+
EXPECT_TRUE(e->ok());
793793
EXPECT_EQ("hello", e.value().value());
794794

795795
expected<exp_string, std::string> e2 = unexpected("world");
796796
EXPECT_FALSE(e2.has_value());
797-
EXPECT_FALSE(e2);
797+
EXPECT_FALSE(e2.ok());
798798
EXPECT_EQ("world", e2.error());
799799

800800
expected<exp_string, std::string> e3 = exp_string(unexpected("world"));
801801
EXPECT_TRUE(e3.has_value());
802802
EXPECT_FALSE(e3.value().has_value());
803-
EXPECT_TRUE(e3);
804-
EXPECT_FALSE(*e3);
803+
EXPECT_TRUE(e3.ok());
804+
EXPECT_FALSE(e3->ok());
805805
EXPECT_EQ("world", e3.value().error());
806806
}
807807

‎base/result_test.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace base {
3030

3131
TEST(result, result_accessors) {
3232
Result<std::string> result = "success";
33-
ASSERT_TRUE(result);
33+
ASSERT_RESULT_OK(result);
3434
ASSERT_TRUE(result.has_value());
3535

3636
EXPECT_EQ("success", *result);
@@ -40,7 +40,7 @@ TEST(result, result_accessors) {
4040
}
4141

4242
TEST(result, result_accessors_rvalue) {
43-
ASSERT_TRUE(Result<std::string>("success"));
43+
ASSERT_TRUE(Result<std::string>("success").ok());
4444
ASSERT_TRUE(Result<std::string>("success").has_value());
4545

4646
EXPECT_EQ("success", *Result<std::string>("success"));
@@ -51,12 +51,12 @@ TEST(result, result_accessors_rvalue) {
5151

5252
TEST(result, result_void) {
5353
Result<void> ok = {};
54-
EXPECT_TRUE(ok);
54+
EXPECT_RESULT_OK(ok);
5555
ok.value(); // should not crash
5656
ASSERT_DEATH(ok.error(), "");
5757

5858
Result<void> fail = Error() << "failure" << 1;
59-
EXPECT_FALSE(fail);
59+
EXPECT_FALSE(fail.ok());
6060
EXPECT_EQ("failure1", fail.error().message());
6161
EXPECT_EQ(0, fail.error().code());
6262
EXPECT_TRUE(ok != fail);
@@ -66,8 +66,8 @@ TEST(result, result_void) {
6666
if (ok) return {};
6767
else return Error() << "failure" << 1;
6868
};
69-
EXPECT_TRUE(test(true));
70-
EXPECT_FALSE(test(false));
69+
EXPECT_TRUE(test(true).ok());
70+
EXPECT_FALSE(test(false).ok());
7171
test(true).value(); // should not crash
7272
ASSERT_DEATH(test(true).error(), "");
7373
ASSERT_DEATH(test(false).value(), "");
@@ -76,7 +76,7 @@ TEST(result, result_void) {
7676

7777
TEST(result, result_error) {
7878
Result<void> result = Error() << "failure" << 1;
79-
ASSERT_FALSE(result);
79+
ASSERT_FALSE(result.ok());
8080
ASSERT_FALSE(result.has_value());
8181

8282
EXPECT_EQ(0, result.error().code());
@@ -85,7 +85,7 @@ TEST(result, result_error) {
8585

8686
TEST(result, result_error_empty) {
8787
Result<void> result = Error();
88-
ASSERT_FALSE(result);
88+
ASSERT_FALSE(result.ok());
8989
ASSERT_FALSE(result.has_value());
9090

9191
EXPECT_EQ(0, result.error().code());
@@ -100,7 +100,7 @@ TEST(result, result_error_rvalue) {
100100
// create is.
101101

102102
auto MakeRvalueErrorResult = []() -> Result<void> { return Error() << "failure" << 1; };
103-
ASSERT_FALSE(MakeRvalueErrorResult());
103+
ASSERT_FALSE(MakeRvalueErrorResult().ok());
104104
ASSERT_FALSE(MakeRvalueErrorResult().has_value());
105105

106106
EXPECT_EQ(0, MakeRvalueErrorResult().error().code());
@@ -112,7 +112,7 @@ TEST(result, result_errno_error) {
112112
errno = test_errno;
113113
Result<void> result = ErrnoError() << "failure" << 1;
114114

115-
ASSERT_FALSE(result);
115+
ASSERT_FALSE(result.ok());
116116
ASSERT_FALSE(result.has_value());
117117

118118
EXPECT_EQ(test_errno, result.error().code());
@@ -124,7 +124,7 @@ TEST(result, result_errno_error_no_text) {
124124
errno = test_errno;
125125
Result<void> result = ErrnoError();
126126

127-
ASSERT_FALSE(result);
127+
ASSERT_FALSE(result.ok());
128128
ASSERT_FALSE(result.has_value());
129129

130130
EXPECT_EQ(test_errno, result.error().code());
@@ -135,12 +135,12 @@ TEST(result, result_error_from_other_result) {
135135
auto error_text = "test error"s;
136136
Result<void> result = Error() << error_text;
137137

138-
ASSERT_FALSE(result);
138+
ASSERT_FALSE(result.ok());
139139
ASSERT_FALSE(result.has_value());
140140

141141
Result<std::string> result2 = result.error();
142142

143-
ASSERT_FALSE(result2);
143+
ASSERT_FALSE(result2.ok());
144144
ASSERT_FALSE(result2.has_value());
145145

146146
EXPECT_EQ(0, result2.error().code());
@@ -151,12 +151,12 @@ TEST(result, result_error_through_ostream) {
151151
auto error_text = "test error"s;
152152
Result<void> result = Error() << error_text;
153153

154-
ASSERT_FALSE(result);
154+
ASSERT_FALSE(result.ok());
155155
ASSERT_FALSE(result.has_value());
156156

157157
Result<std::string> result2 = Error() << result.error();
158158

159-
ASSERT_FALSE(result2);
159+
ASSERT_FALSE(result2.ok());
160160
ASSERT_FALSE(result2.has_value());
161161

162162
EXPECT_EQ(0, result2.error().code());
@@ -171,12 +171,12 @@ TEST(result, result_errno_error_through_ostream) {
171171

172172
errno = 0;
173173

174-
ASSERT_FALSE(result);
174+
ASSERT_FALSE(result.ok());
175175
ASSERT_FALSE(result.has_value());
176176

177177
Result<std::string> result2 = Error() << result.error();
178178

179-
ASSERT_FALSE(result2);
179+
ASSERT_FALSE(result2.ok());
180180
ASSERT_FALSE(result2.has_value());
181181

182182
EXPECT_EQ(test_errno, result2.error().code());
@@ -186,7 +186,7 @@ TEST(result, result_errno_error_through_ostream) {
186186
TEST(result, constructor_forwarding) {
187187
auto result = Result<std::string>(std::in_place, 5, 'a');
188188

189-
ASSERT_TRUE(result);
189+
ASSERT_RESULT_OK(result);
190190
ASSERT_TRUE(result.has_value());
191191

192192
EXPECT_EQ("aaaaa", *result);
@@ -254,7 +254,7 @@ TEST(result, no_copy_on_return) {
254254
// are called.
255255

256256
auto result1 = ReturnConstructorTracker("");
257-
ASSERT_TRUE(result1);
257+
ASSERT_RESULT_OK(result1);
258258
EXPECT_EQ("literal string", result1->string);
259259
EXPECT_EQ(1U, ConstructorTracker::constructor_called);
260260
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -263,7 +263,7 @@ TEST(result, no_copy_on_return) {
263263
EXPECT_EQ(0U, ConstructorTracker::move_assignment_called);
264264

265265
auto result2 = ReturnConstructorTracker("test2");
266-
ASSERT_TRUE(result2);
266+
ASSERT_RESULT_OK(result2);
267267
EXPECT_EQ("test2test22", result2->string);
268268
EXPECT_EQ(2U, ConstructorTracker::constructor_called);
269269
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -272,7 +272,7 @@ TEST(result, no_copy_on_return) {
272272
EXPECT_EQ(0U, ConstructorTracker::move_assignment_called);
273273

274274
auto result3 = ReturnConstructorTracker("test3");
275-
ASSERT_TRUE(result3);
275+
ASSERT_RESULT_OK(result3);
276276
EXPECT_EQ("test3 test3", result3->string);
277277
EXPECT_EQ(3U, ConstructorTracker::constructor_called);
278278
EXPECT_EQ(0U, ConstructorTracker::copy_constructor_called);
@@ -287,20 +287,20 @@ TEST(result, no_copy_on_return) {
287287
TEST(result, result_result_with_success) {
288288
auto return_result_result_with_success = []() -> Result<Result<void>> { return Result<void>(); };
289289
auto result = return_result_result_with_success();
290-
ASSERT_TRUE(result);
291-
ASSERT_TRUE(*result);
290+
ASSERT_RESULT_OK(result);
291+
ASSERT_RESULT_OK(*result);
292292

293293
auto inner_result = result.value();
294-
ASSERT_TRUE(inner_result);
294+
ASSERT_RESULT_OK(inner_result);
295295
}
296296

297297
TEST(result, result_result_with_failure) {
298298
auto return_result_result_with_error = []() -> Result<Result<void>> {
299299
return Result<void>(ResultError("failure string", 6));
300300
};
301301
auto result = return_result_result_with_error();
302-
ASSERT_TRUE(result);
303-
ASSERT_FALSE(*result);
302+
ASSERT_RESULT_OK(result);
303+
ASSERT_FALSE(result->ok());
304304
EXPECT_EQ("failure string", (*result).error().message());
305305
EXPECT_EQ(6, (*result).error().code());
306306
}
@@ -320,7 +320,7 @@ TEST(result, result_two_parameter_constructor_same_type) {
320320
};
321321

322322
auto result = return_test_struct();
323-
ASSERT_TRUE(result);
323+
ASSERT_RESULT_OK(result);
324324
EXPECT_EQ(36, result->value_);
325325
}
326326

@@ -344,13 +344,13 @@ TEST(result, preserve_errno) {
344344
errno = 1;
345345
int old_errno = errno;
346346
Result<int> result = Error() << "Failed" << SetErrnoToTwo<char>;
347-
ASSERT_FALSE(result);
347+
ASSERT_FALSE(result.ok());
348348
EXPECT_EQ(old_errno, errno);
349349

350350
errno = 1;
351351
old_errno = errno;
352352
Result<int> result2 = ErrnoError() << "Failed" << SetErrnoToTwo<char>;
353-
ASSERT_FALSE(result2);
353+
ASSERT_FALSE(result2.ok());
354354
EXPECT_EQ(old_errno, errno);
355355
EXPECT_EQ(old_errno, result2.error().code());
356356
}

‎fs_mgr/libfs_avb/fs_avb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ AvbUniquePtr AvbHandle::LoadAndVerifyVbmeta(const FstabEntry& fstab_entry,
329329
// or a string indicating multiple keys separated by ':'.
330330
std::vector<std::string> allowed_avb_keys;
331331
auto list_avb_keys_in_dir = ListFiles(fstab_entry.avb_keys);
332-
if (list_avb_keys_in_dir) {
332+
if (list_avb_keys_in_dir.ok()) {
333333
std::sort(list_avb_keys_in_dir->begin(), list_avb_keys_in_dir->end());
334334
allowed_avb_keys = *list_avb_keys_in_dir;
335335
} else {

‎init/action.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Result<void> RunBuiltinFunction(const BuiltinFunction& function,
3636
builtin_arguments.args[0] = args[0];
3737
for (std::size_t i = 1; i < args.size(); ++i) {
3838
auto expanded_arg = ExpandProps(args[i]);
39-
if (!expanded_arg) {
39+
if (!expanded_arg.ok()) {
4040
return expanded_arg.error();
4141
}
4242
builtin_arguments.args[i] = std::move(*expanded_arg);
@@ -59,7 +59,7 @@ Result<void> Command::InvokeFunc(Subcontext* subcontext) const {
5959
}
6060

6161
auto expanded_args = subcontext->ExpandArgs(args_);
62-
if (!expanded_args) {
62+
if (!expanded_args.ok()) {
6363
return expanded_args.error();
6464
}
6565
return RunBuiltinFunction(func_, *expanded_args, subcontext->context());
@@ -75,7 +75,7 @@ Result<void> Command::CheckCommand() const {
7575
builtin_arguments.args[0] = args_[0];
7676
for (size_t i = 1; i < args_.size(); ++i) {
7777
auto expanded_arg = ExpandProps(args_[i]);
78-
if (!expanded_arg) {
78+
if (!expanded_arg.ok()) {
7979
if (expanded_arg.error().message().find("doesn't exist while expanding") !=
8080
std::string::npos) {
8181
// If we failed because we won't have a property, use an empty string, which is
@@ -114,7 +114,7 @@ Result<void> Action::AddCommand(std::vector<std::string>&& args, int line) {
114114
}
115115

116116
auto map_result = function_map_->Find(args);
117-
if (!map_result) {
117+
if (!map_result.ok()) {
118118
return Error() << map_result.error();
119119
}
120120

@@ -134,7 +134,7 @@ std::size_t Action::NumCommands() const {
134134
size_t Action::CheckAllCommands() const {
135135
size_t failures = 0;
136136
for (const auto& command : commands_) {
137-
if (auto result = command.CheckCommand(); !result) {
137+
if (auto result = command.CheckCommand(); !result.ok()) {
138138
LOG(ERROR) << "Command '" << command.BuildCommandString() << "' (" << filename_ << ":"
139139
<< command.line() << ") failed: " << result.error();
140140
++failures;
@@ -169,7 +169,7 @@ void Action::ExecuteCommand(const Command& command) const {
169169

170170
LOG(INFO) << "Command '" << cmd_str << "' action=" << trigger_name << " (" << filename_
171171
<< ":" << command.line() << ") took " << duration.count() << "ms and "
172-
<< (result ? "succeeded" : "failed: " + result.error().message());
172+
<< (result.ok() ? "succeeded" : "failed: " + result.error().message());
173173
}
174174
}
175175

0 commit comments

Comments
 (0)