Skip to content

Commit aa8feee

Browse files
kazutakahiratakazutakahirata
committed
Don't use Optional::hasValue (NFC)
1 parent b8df409 commit aa8feee

File tree

372 files changed

+2098
-2180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+2098
-2180
lines changed

‎clang-tools-extra/clang-doc/HTMLGenerator.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -653,10 +653,10 @@ genHTML(const EnumInfo &I, const ClangDocContext &CDCtx) {
653653

654654
if (I.DefLoc) {
655655
if (!CDCtx.RepositoryUrl)
656-
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
656+
Out.emplace_back(writeFileDefinition(*I.DefLoc));
657657
else
658-
Out.emplace_back(writeFileDefinition(
659-
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
658+
Out.emplace_back(
659+
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
660660
}
661661

662662
std::string Description;
@@ -702,10 +702,10 @@ genHTML(const FunctionInfo &I, const ClangDocContext &CDCtx,
702702

703703
if (I.DefLoc) {
704704
if (!CDCtx.RepositoryUrl)
705-
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
705+
Out.emplace_back(writeFileDefinition(*I.DefLoc));
706706
else
707-
Out.emplace_back(writeFileDefinition(
708-
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
707+
Out.emplace_back(
708+
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
709709
}
710710

711711
std::string Description;
@@ -768,10 +768,10 @@ genHTML(const RecordInfo &I, Index &InfoIndex, const ClangDocContext &CDCtx,
768768

769769
if (I.DefLoc) {
770770
if (!CDCtx.RepositoryUrl)
771-
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
771+
Out.emplace_back(writeFileDefinition(*I.DefLoc));
772772
else
773-
Out.emplace_back(writeFileDefinition(
774-
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
773+
Out.emplace_back(
774+
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
775775
}
776776

777777
std::string Description;

‎clang-tools-extra/clang-tidy/bugprone/NotNullTerminatedResultCheck.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,8 @@ void NotNullTerminatedResultCheck::check(
817817
++It;
818818
}
819819

820-
if (AreSafeFunctionsWanted.hasValue())
821-
UseSafeFunctions = AreSafeFunctionsWanted.getValue();
820+
if (AreSafeFunctionsWanted)
821+
UseSafeFunctions = *AreSafeFunctionsWanted;
822822
}
823823

824824
StringRef Name = FunctionExpr->getDirectCallee()->getName();

‎clang-tools-extra/clangd/ClangdLSPServer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,9 @@ void ClangdLSPServer::onDocumentDidOpen(
663663
void ClangdLSPServer::onDocumentDidChange(
664664
const DidChangeTextDocumentParams &Params) {
665665
auto WantDiags = WantDiagnostics::Auto;
666-
if (Params.wantDiagnostics.hasValue())
667-
WantDiags = Params.wantDiagnostics.getValue() ? WantDiagnostics::Yes
668-
: WantDiagnostics::No;
666+
if (Params.wantDiagnostics)
667+
WantDiags =
668+
*Params.wantDiagnostics ? WantDiagnostics::Yes : WantDiagnostics::No;
669669

670670
PathRef File = Params.textDocument.uri.file();
671671
auto Code = Server->getDraft(File);

‎clang-tools-extra/clangd/ClangdServer.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,9 @@ void ClangdServer::codeComplete(PathRef File, Position Pos,
411411
clang::clangd::trace::Span Tracer("Completion results callback");
412412
CB(std::move(Result));
413413
}
414-
if (SpecFuzzyFind && SpecFuzzyFind->NewReq.hasValue()) {
414+
if (SpecFuzzyFind && SpecFuzzyFind->NewReq) {
415415
std::lock_guard<std::mutex> Lock(CachedCompletionFuzzyFindRequestMutex);
416-
CachedCompletionFuzzyFindRequestByFile[File] =
417-
SpecFuzzyFind->NewReq.getValue();
416+
CachedCompletionFuzzyFindRequestByFile[File] = *SpecFuzzyFind->NewReq;
418417
}
419418
// SpecFuzzyFind is only destroyed after speculative fuzzy find finishes.
420419
// We don't want `codeComplete` to wait for the async call if it doesn't use

‎clang-tools-extra/clangd/CodeComplete.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,9 @@ struct CodeCompletionBuilder {
391391
ToInclude.takeError());
392392
}
393393
// Prefer includes that do not need edits (i.e. already exist).
394-
std::stable_partition(Completion.Includes.begin(),
395-
Completion.Includes.end(),
396-
[](const CodeCompletion::IncludeCandidate &I) {
397-
return !I.Insertion.hasValue();
398-
});
394+
std::stable_partition(
395+
Completion.Includes.begin(), Completion.Includes.end(),
396+
[](const CodeCompletion::IncludeCandidate &I) { return !I.Insertion; });
399397
}
400398

401399
void add(const CompletionCandidate &C, CodeCompletionString *SemaCCS) {

‎clang-tools-extra/clangd/ConfigCompile.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ struct FragmentCompiler {
358358
}
359359
#endif
360360
// Make sure exactly one of the Sources is set.
361-
unsigned SourceCount = External.File.hasValue() +
362-
External.Server.hasValue() + *External.IsNone;
361+
unsigned SourceCount = External.File.has_value() +
362+
External.Server.has_value() + *External.IsNone;
363363
if (SourceCount != 1) {
364364
diag(Error, "Exactly one of File, Server or None must be set.",
365365
BlockRange);

‎clang-tools-extra/clangd/FeatureModule.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ namespace clang {
1313
namespace clangd {
1414

1515
void FeatureModule::initialize(const Facilities &F) {
16-
assert(!Fac.hasValue() && "Initialized twice");
16+
assert(!Fac && "Initialized twice");
1717
Fac.emplace(F);
1818
}
1919

2020
FeatureModule::Facilities &FeatureModule::facilities() {
21-
assert(Fac.hasValue() && "Not initialized yet");
21+
assert(Fac && "Not initialized yet");
2222
return *Fac;
2323
}
2424

‎clang-tools-extra/clangd/index/YAMLSerialization.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -354,23 +354,23 @@ template <> struct MappingTraits<CompileCommandYAML> {
354354

355355
template <> struct MappingTraits<VariantEntry> {
356356
static void mapping(IO &IO, VariantEntry &Variant) {
357-
if (IO.mapTag("!Symbol", Variant.Symbol.hasValue())) {
357+
if (IO.mapTag("!Symbol", Variant.Symbol.has_value())) {
358358
if (!IO.outputting())
359359
Variant.Symbol.emplace();
360360
MappingTraits<Symbol>::mapping(IO, *Variant.Symbol);
361-
} else if (IO.mapTag("!Refs", Variant.Refs.hasValue())) {
361+
} else if (IO.mapTag("!Refs", Variant.Refs.has_value())) {
362362
if (!IO.outputting())
363363
Variant.Refs.emplace();
364364
MappingTraits<RefBundle>::mapping(IO, *Variant.Refs);
365-
} else if (IO.mapTag("!Relations", Variant.Relation.hasValue())) {
365+
} else if (IO.mapTag("!Relations", Variant.Relation.has_value())) {
366366
if (!IO.outputting())
367367
Variant.Relation.emplace();
368368
MappingTraits<Relation>::mapping(IO, *Variant.Relation);
369-
} else if (IO.mapTag("!Source", Variant.Source.hasValue())) {
369+
} else if (IO.mapTag("!Source", Variant.Source.has_value())) {
370370
if (!IO.outputting())
371371
Variant.Source.emplace();
372372
MappingTraits<IncludeGraphNode>::mapping(IO, *Variant.Source);
373-
} else if (IO.mapTag("!Cmd", Variant.Cmd.hasValue())) {
373+
} else if (IO.mapTag("!Cmd", Variant.Cmd.has_value())) {
374374
if (!IO.outputting())
375375
Variant.Cmd.emplace();
376376
MappingTraits<CompileCommandYAML>::mapping(

‎clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ CompileFlags: { Add: [foo, bar] }
8282
EXPECT_THAT(Results[1].CompileFlags.Add, ElementsAre(val("b\naz\n")));
8383

8484
ASSERT_TRUE(Results[2].Index.Background);
85-
EXPECT_EQ("Skip", *Results[2].Index.Background.getValue());
85+
EXPECT_EQ("Skip", *Results[2].Index.Background.value());
8686
EXPECT_THAT(Results[3].Diagnostics.ClangTidy.CheckOptions,
8787
ElementsAre(PairVal("IgnoreMacros", "true"),
8888
PairVal("example-check.ExampleOption", "0")));
8989
EXPECT_TRUE(Results[3].Diagnostics.UnusedIncludes);
90-
EXPECT_EQ("Strict", *Results[3].Diagnostics.UnusedIncludes.getValue());
90+
EXPECT_EQ("Strict", *Results[3].Diagnostics.UnusedIncludes.value());
9191
}
9292

9393
TEST(ParseYAML, Locations) {
@@ -163,10 +163,10 @@ TEST(ParseYAML, ExternalBlockNone) {
163163
ASSERT_THAT(Diags.Diagnostics, IsEmpty());
164164
ASSERT_EQ(Results.size(), 1u);
165165
ASSERT_TRUE(Results[0].Index.External);
166-
EXPECT_FALSE(Results[0].Index.External.getValue()->File.hasValue());
167-
EXPECT_FALSE(Results[0].Index.External.getValue()->MountPoint.hasValue());
168-
EXPECT_FALSE(Results[0].Index.External.getValue()->Server.hasValue());
169-
EXPECT_THAT(*Results[0].Index.External.getValue()->IsNone, testing::Eq(true));
166+
EXPECT_FALSE(Results[0].Index.External.value()->File.has_value());
167+
EXPECT_FALSE(Results[0].Index.External.value()->MountPoint.has_value());
168+
EXPECT_FALSE(Results[0].Index.External.value()->Server.has_value());
169+
EXPECT_THAT(*Results[0].Index.External.value()->IsNone, testing::Eq(true));
170170
}
171171

172172
TEST(ParseYAML, ExternalBlock) {
@@ -182,10 +182,10 @@ TEST(ParseYAML, ExternalBlock) {
182182
Fragment::parseYAML(YAML.code(), "config.yaml", Diags.callback());
183183
ASSERT_EQ(Results.size(), 1u);
184184
ASSERT_TRUE(Results[0].Index.External);
185-
EXPECT_THAT(*Results[0].Index.External.getValue()->File, val("foo"));
186-
EXPECT_THAT(*Results[0].Index.External.getValue()->MountPoint, val("baz"));
185+
EXPECT_THAT(*Results[0].Index.External.value()->File, val("foo"));
186+
EXPECT_THAT(*Results[0].Index.External.value()->MountPoint, val("baz"));
187187
ASSERT_THAT(Diags.Diagnostics, IsEmpty());
188-
EXPECT_THAT(*Results[0].Index.External.getValue()->Server, val("bar"));
188+
EXPECT_THAT(*Results[0].Index.External.value()->Server, val("bar"));
189189
}
190190

191191
TEST(ParseYAML, AllScopes) {

‎clang-tools-extra/clangd/unittests/FSTests.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ TEST(FSTests, PreambleStatusCache) {
2828
EXPECT_TRUE(ProduceFS->status("y"));
2929
EXPECT_TRUE(ProduceFS->status("main"));
3030

31-
EXPECT_TRUE(StatCache.lookup(testPath("x")).hasValue());
32-
EXPECT_TRUE(StatCache.lookup(testPath("y")).hasValue());
31+
EXPECT_TRUE(StatCache.lookup(testPath("x")).has_value());
32+
EXPECT_TRUE(StatCache.lookup(testPath("y")).has_value());
3333
// Main file is not cached.
34-
EXPECT_FALSE(StatCache.lookup(testPath("main")).hasValue());
34+
EXPECT_FALSE(StatCache.lookup(testPath("main")).has_value());
3535

3636
llvm::vfs::Status S("fake", llvm::sys::fs::UniqueID(123, 456),
3737
std::chrono::system_clock::now(), 0, 0, 1024,

‎clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,14 @@ TEST(GlobalCompilationDatabaseTest, CompileFlagsDirectory) {
331331
FS.Files[testPath("x/compile_flags.txt")] = "-DFOO";
332332
DirectoryBasedGlobalCompilationDatabase CDB(FS);
333333
auto Commands = CDB.getCompileCommand(testPath("x/y.cpp"));
334-
ASSERT_TRUE(Commands.hasValue());
335-
EXPECT_THAT(Commands.getValue().CommandLine, Contains("-DFOO"));
334+
ASSERT_TRUE(Commands.has_value());
335+
EXPECT_THAT(Commands->CommandLine, Contains("-DFOO"));
336336
// Make sure we pick the right working directory.
337-
EXPECT_EQ(testPath("x"), Commands.getValue().Directory);
337+
EXPECT_EQ(testPath("x"), Commands->Directory);
338338
}
339339

340340
MATCHER_P(hasArg, Flag, "") {
341-
if (!arg.hasValue()) {
341+
if (!arg) {
342342
*result_listener << "command is null";
343343
return false;
344344
}

‎clang-tools-extra/clangd/unittests/HeaderSourceSwitchTests.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ TEST(HeaderSourceSwitchTest, FileHeuristic) {
3333
FS.Files[Invalid];
3434
Optional<Path> PathResult =
3535
getCorrespondingHeaderOrSource(FooCpp, FS.view(llvm::None));
36-
EXPECT_TRUE(PathResult.hasValue());
37-
ASSERT_EQ(PathResult.getValue(), FooH);
36+
EXPECT_TRUE(PathResult.has_value());
37+
ASSERT_EQ(*PathResult, FooH);
3838

3939
PathResult = getCorrespondingHeaderOrSource(FooH, FS.view(llvm::None));
40-
EXPECT_TRUE(PathResult.hasValue());
41-
ASSERT_EQ(PathResult.getValue(), FooCpp);
40+
EXPECT_TRUE(PathResult.has_value());
41+
ASSERT_EQ(*PathResult, FooCpp);
4242

4343
// Test with header file in capital letters and different extension, source
4444
// file with different extension
@@ -48,17 +48,17 @@ TEST(HeaderSourceSwitchTest, FileHeuristic) {
4848
FS.Files[FooC];
4949
FS.Files[FooHH];
5050
PathResult = getCorrespondingHeaderOrSource(FooC, FS.view(llvm::None));
51-
EXPECT_TRUE(PathResult.hasValue());
52-
ASSERT_EQ(PathResult.getValue(), FooHH);
51+
EXPECT_TRUE(PathResult.has_value());
52+
ASSERT_EQ(*PathResult, FooHH);
5353

5454
// Test with both capital letters
5555
auto Foo2C = testPath("foo2.C");
5656
auto Foo2HH = testPath("foo2.HH");
5757
FS.Files[Foo2C];
5858
FS.Files[Foo2HH];
5959
PathResult = getCorrespondingHeaderOrSource(Foo2C, FS.view(llvm::None));
60-
EXPECT_TRUE(PathResult.hasValue());
61-
ASSERT_EQ(PathResult.getValue(), Foo2HH);
60+
EXPECT_TRUE(PathResult.has_value());
61+
ASSERT_EQ(*PathResult, Foo2HH);
6262

6363
// Test with source file as capital letter and .hxx header file
6464
auto Foo3C = testPath("foo3.C");
@@ -67,13 +67,13 @@ TEST(HeaderSourceSwitchTest, FileHeuristic) {
6767
FS.Files[Foo3C];
6868
FS.Files[Foo3HXX];
6969
PathResult = getCorrespondingHeaderOrSource(Foo3C, FS.view(llvm::None));
70-
EXPECT_TRUE(PathResult.hasValue());
71-
ASSERT_EQ(PathResult.getValue(), Foo3HXX);
70+
EXPECT_TRUE(PathResult.has_value());
71+
ASSERT_EQ(*PathResult, Foo3HXX);
7272

7373
// Test if asking for a corresponding file that doesn't exist returns an empty
7474
// string.
7575
PathResult = getCorrespondingHeaderOrSource(Invalid, FS.view(llvm::None));
76-
EXPECT_FALSE(PathResult.hasValue());
76+
EXPECT_FALSE(PathResult.has_value());
7777
}
7878

7979
MATCHER_P(declNamed, Name, "") {

‎clang-tools-extra/clangd/unittests/LSPBinderTests.cpp

+15-16
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,18 @@ TEST(LSPBinderTest, IncomingCalls) {
9393

9494
auto &RawPlusOne = RawHandlers.MethodHandlers["plusOne"];
9595
RawPlusOne(1, capture(Reply));
96-
ASSERT_TRUE(Reply.hasValue());
97-
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::HasValue(2));
96+
ASSERT_TRUE(Reply.has_value());
97+
EXPECT_THAT_EXPECTED(*Reply, llvm::HasValue(2));
9898
RawPlusOne("foo", capture(Reply));
99-
ASSERT_TRUE(Reply.hasValue());
99+
ASSERT_TRUE(Reply.has_value());
100100
EXPECT_THAT_EXPECTED(
101-
Reply.getValue(),
102-
llvm::FailedWithMessage(
103-
HasSubstr("failed to decode plusOne request: expected integer")));
101+
*Reply, llvm::FailedWithMessage(HasSubstr(
102+
"failed to decode plusOne request: expected integer")));
104103

105104
auto &RawFail = RawHandlers.MethodHandlers["fail"];
106105
RawFail(2, capture(Reply));
107-
ASSERT_TRUE(Reply.hasValue());
108-
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::FailedWithMessage("X=2"));
106+
ASSERT_TRUE(Reply.has_value());
107+
EXPECT_THAT_EXPECTED(*Reply, llvm::FailedWithMessage("X=2"));
109108

110109
auto &RawNotify = RawHandlers.NotificationHandlers["notify"];
111110
RawNotify(42);
@@ -117,8 +116,8 @@ TEST(LSPBinderTest, IncomingCalls) {
117116

118117
auto &RawCmdPlusOne = RawHandlers.CommandHandlers["cmdPlusOne"];
119118
RawCmdPlusOne(1, capture(Reply));
120-
ASSERT_TRUE(Reply.hasValue());
121-
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::HasValue(2));
119+
ASSERT_TRUE(Reply.has_value());
120+
EXPECT_THAT_EXPECTED(*Reply, llvm::HasValue(2));
122121

123122
// None of this generated any outgoing traffic.
124123
EXPECT_THAT(RawOutgoing.Received, IsEmpty());
@@ -139,23 +138,23 @@ TEST(LSPBinderTest, OutgoingCalls) {
139138
llvm::Optional<llvm::Expected<Foo>> Reply;
140139
Echo(Foo{2}, capture(Reply));
141140
EXPECT_THAT(RawOutgoing.take("echo"), ElementsAre(llvm::json::Value(2)));
142-
ASSERT_TRUE(Reply.hasValue());
143-
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::HasValue(Foo{2}));
141+
ASSERT_TRUE(Reply.has_value());
142+
EXPECT_THAT_EXPECTED(*Reply, llvm::HasValue(Foo{2}));
144143

145144
// JSON response is integer, can't be parsed as string.
146145
llvm::Optional<llvm::Expected<std::string>> WrongTypeReply;
147146
WrongSignature(Foo{2}, capture(WrongTypeReply));
148147
EXPECT_THAT(RawOutgoing.take("wrongSignature"),
149148
ElementsAre(llvm::json::Value(2)));
150-
ASSERT_TRUE(Reply.hasValue());
151-
EXPECT_THAT_EXPECTED(WrongTypeReply.getValue(),
149+
ASSERT_TRUE(Reply.has_value());
150+
EXPECT_THAT_EXPECTED(*WrongTypeReply,
152151
llvm::FailedWithMessage(
153152
HasSubstr("failed to decode wrongSignature reply")));
154153

155154
Fail(Foo{2}, capture(Reply));
156155
EXPECT_THAT(RawOutgoing.take("fail"), ElementsAre(llvm::json::Value(2)));
157-
ASSERT_TRUE(Reply.hasValue());
158-
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::FailedWithMessage("Params=2"));
156+
ASSERT_TRUE(Reply.has_value());
157+
EXPECT_THAT_EXPECTED(*Reply, llvm::FailedWithMessage("Params=2"));
159158
}
160159

161160
} // namespace

‎clang-tools-extra/clangd/unittests/TidyProviderTests.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ TEST(TidyProvider, NestedDirectories) {
3737
TidyProvider Provider = provideClangTidyFiles(FS);
3838

3939
auto BaseOptions = getTidyOptionsForFile(Provider, testPath("File.cpp"));
40-
ASSERT_TRUE(BaseOptions.Checks.hasValue());
40+
ASSERT_TRUE(BaseOptions.Checks.has_value());
4141
EXPECT_EQ(*BaseOptions.Checks, "llvm-*");
4242
EXPECT_EQ(BaseOptions.CheckOptions.lookup("TestKey").Value, "1");
4343

4444
auto Sub1Options = getTidyOptionsForFile(Provider, testPath("sub1/File.cpp"));
45-
ASSERT_TRUE(Sub1Options.Checks.hasValue());
45+
ASSERT_TRUE(Sub1Options.Checks.has_value());
4646
EXPECT_EQ(*Sub1Options.Checks, "misc-*");
4747
EXPECT_EQ(Sub1Options.CheckOptions.lookup("TestKey").Value, "2");
4848

4949
auto Sub2Options =
5050
getTidyOptionsForFile(Provider, testPath("sub1/sub2/File.cpp"));
51-
ASSERT_TRUE(Sub2Options.Checks.hasValue());
51+
ASSERT_TRUE(Sub2Options.Checks.has_value());
5252
EXPECT_EQ(*Sub2Options.Checks, "misc-*,bugprone-*");
5353
EXPECT_EQ(Sub2Options.CheckOptions.lookup("TestKey").Value, "3");
5454
}

‎clang-tools-extra/pseudo/lib/GLR.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@ class GLRReduce {
375375
for (auto &A : Params.Table.getActions(Head->State, Lookahead)) {
376376
if (A.kind() != LRTable::Action::Reduce)
377377
continue;
378-
if (RID.hasValue())
378+
if (RID)
379379
return false;
380380
RID = A.getReduceRule();
381381
}
382-
if (!RID.hasValue())
382+
if (!RID)
383383
return true; // no reductions available, but we've processed the head!
384384
const auto &Rule = Params.G.lookupRule(*RID);
385385
const GSS::Node *Base = Head;

‎clang-tools-extra/unittests/clang-doc/ClangDocTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ void CheckBaseInfo(Info *Expected, Info *Actual) {
9595

9696
void CheckSymbolInfo(SymbolInfo *Expected, SymbolInfo *Actual) {
9797
CheckBaseInfo(Expected, Actual);
98-
EXPECT_EQ(Expected->DefLoc.hasValue(), Actual->DefLoc.hasValue());
99-
if (Expected->DefLoc.hasValue() && Actual->DefLoc.hasValue()) {
98+
EXPECT_EQ(Expected->DefLoc.has_value(), Actual->DefLoc.has_value());
99+
if (Expected->DefLoc && Actual->DefLoc) {
100100
EXPECT_EQ(Expected->DefLoc->LineNumber, Actual->DefLoc->LineNumber);
101101
EXPECT_EQ(Expected->DefLoc->Filename, Actual->DefLoc->Filename);
102102
}

0 commit comments

Comments
 (0)