Skip to content

Commit 3b7c3a6

Browse files
kazutakahiratakazutakahirata
committed
Revert "Don't use Optional::hasValue (NFC)"
This reverts commit aa8feee.
1 parent aa8feee commit 3b7c3a6

File tree

372 files changed

+2180
-2098
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

+2180
-2098
lines changed

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

Lines changed: 9 additions & 9 deletions
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));
656+
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
657657
else
658-
Out.emplace_back(
659-
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
658+
Out.emplace_back(writeFileDefinition(
659+
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
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));
705+
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
706706
else
707-
Out.emplace_back(
708-
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
707+
Out.emplace_back(writeFileDefinition(
708+
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
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));
771+
Out.emplace_back(writeFileDefinition(I.DefLoc.getValue()));
772772
else
773-
Out.emplace_back(
774-
writeFileDefinition(*I.DefLoc, StringRef{*CDCtx.RepositoryUrl}));
773+
Out.emplace_back(writeFileDefinition(
774+
I.DefLoc.getValue(), StringRef{CDCtx.RepositoryUrl.getValue()}));
775775
}
776776

777777
std::string Description;

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

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

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

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

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

Lines changed: 3 additions & 3 deletions
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)
667-
WantDiags =
668-
*Params.wantDiagnostics ? WantDiagnostics::Yes : WantDiagnostics::No;
666+
if (Params.wantDiagnostics.hasValue())
667+
WantDiags = Params.wantDiagnostics.getValue() ? WantDiagnostics::Yes
668+
: WantDiagnostics::No;
669669

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,10 @@ 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) {
414+
if (SpecFuzzyFind && SpecFuzzyFind->NewReq.hasValue()) {
415415
std::lock_guard<std::mutex> Lock(CachedCompletionFuzzyFindRequestMutex);
416-
CachedCompletionFuzzyFindRequestByFile[File] = *SpecFuzzyFind->NewReq;
416+
CachedCompletionFuzzyFindRequestByFile[File] =
417+
SpecFuzzyFind->NewReq.getValue();
417418
}
418419
// SpecFuzzyFind is only destroyed after speculative fuzzy find finishes.
419420
// We don't want `codeComplete` to wait for the async call if it doesn't use

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

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

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

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

Lines changed: 2 additions & 2 deletions
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.has_value() +
362-
External.Server.has_value() + *External.IsNone;
361+
unsigned SourceCount = External.File.hasValue() +
362+
External.Server.hasValue() + *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

Lines changed: 2 additions & 2 deletions
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 && "Initialized twice");
16+
assert(!Fac.hasValue() && "Initialized twice");
1717
Fac.emplace(F);
1818
}
1919

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

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

Lines changed: 5 additions & 5 deletions
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.has_value())) {
357+
if (IO.mapTag("!Symbol", Variant.Symbol.hasValue())) {
358358
if (!IO.outputting())
359359
Variant.Symbol.emplace();
360360
MappingTraits<Symbol>::mapping(IO, *Variant.Symbol);
361-
} else if (IO.mapTag("!Refs", Variant.Refs.has_value())) {
361+
} else if (IO.mapTag("!Refs", Variant.Refs.hasValue())) {
362362
if (!IO.outputting())
363363
Variant.Refs.emplace();
364364
MappingTraits<RefBundle>::mapping(IO, *Variant.Refs);
365-
} else if (IO.mapTag("!Relations", Variant.Relation.has_value())) {
365+
} else if (IO.mapTag("!Relations", Variant.Relation.hasValue())) {
366366
if (!IO.outputting())
367367
Variant.Relation.emplace();
368368
MappingTraits<Relation>::mapping(IO, *Variant.Relation);
369-
} else if (IO.mapTag("!Source", Variant.Source.has_value())) {
369+
} else if (IO.mapTag("!Source", Variant.Source.hasValue())) {
370370
if (!IO.outputting())
371371
Variant.Source.emplace();
372372
MappingTraits<IncludeGraphNode>::mapping(IO, *Variant.Source);
373-
} else if (IO.mapTag("!Cmd", Variant.Cmd.has_value())) {
373+
} else if (IO.mapTag("!Cmd", Variant.Cmd.hasValue())) {
374374
if (!IO.outputting())
375375
Variant.Cmd.emplace();
376376
MappingTraits<CompileCommandYAML>::mapping(

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

Lines changed: 9 additions & 9 deletions
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.value());
85+
EXPECT_EQ("Skip", *Results[2].Index.Background.getValue());
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.value());
90+
EXPECT_EQ("Strict", *Results[3].Diagnostics.UnusedIncludes.getValue());
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.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));
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));
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.value()->File, val("foo"));
186-
EXPECT_THAT(*Results[0].Index.External.value()->MountPoint, val("baz"));
185+
EXPECT_THAT(*Results[0].Index.External.getValue()->File, val("foo"));
186+
EXPECT_THAT(*Results[0].Index.External.getValue()->MountPoint, val("baz"));
187187
ASSERT_THAT(Diags.Diagnostics, IsEmpty());
188-
EXPECT_THAT(*Results[0].Index.External.value()->Server, val("bar"));
188+
EXPECT_THAT(*Results[0].Index.External.getValue()->Server, val("bar"));
189189
}
190190

191191
TEST(ParseYAML, AllScopes) {

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

Lines changed: 3 additions & 3 deletions
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")).has_value());
32-
EXPECT_TRUE(StatCache.lookup(testPath("y")).has_value());
31+
EXPECT_TRUE(StatCache.lookup(testPath("x")).hasValue());
32+
EXPECT_TRUE(StatCache.lookup(testPath("y")).hasValue());
3333
// Main file is not cached.
34-
EXPECT_FALSE(StatCache.lookup(testPath("main")).has_value());
34+
EXPECT_FALSE(StatCache.lookup(testPath("main")).hasValue());
3535

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

0 commit comments

Comments
 (0)