Skip to content

Commit 53daa17

Browse files
kazutakahiratakazutakahirata
committed
[clang, clang-tools-extra] Use has_value instead of hasValue (NFC)
1 parent 3361a36 commit 53daa17

29 files changed

+109
-112
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -745,15 +745,15 @@ class ForwardingCallVisitor
745745
if (Callee) {
746746
handleCall(Callee, E->arguments());
747747
}
748-
return !Info.hasValue();
748+
return !Info.has_value();
749749
}
750750

751751
bool VisitCXXConstructExpr(CXXConstructExpr *E) {
752752
auto *Callee = E->getConstructor();
753753
if (Callee) {
754754
handleCall(Callee, E->arguments());
755755
}
756-
return !Info.hasValue();
756+
return !Info.has_value();
757757
}
758758

759759
// The expanded parameter pack to be resolved

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ struct CodeCompletionBuilder {
394394
std::stable_partition(Completion.Includes.begin(),
395395
Completion.Includes.end(),
396396
[](const CodeCompletion::IncludeCandidate &I) {
397-
return !I.Insertion.hasValue();
397+
return !I.Insertion.has_value();
398398
});
399399
}
400400

‎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/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

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ 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());
166+
EXPECT_FALSE(Results[0].Index.External.getValue()->File.has_value());
167+
EXPECT_FALSE(Results[0].Index.External.getValue()->MountPoint.has_value());
168+
EXPECT_FALSE(Results[0].Index.External.getValue()->Server.has_value());
169169
EXPECT_THAT(*Results[0].Index.External.getValue()->IsNone, testing::Eq(true));
170170
}
171171

‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ 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());
334+
ASSERT_TRUE(Commands.has_value());
335335
EXPECT_THAT(Commands.getValue().CommandLine, Contains("-DFOO"));
336336
// Make sure we pick the right working directory.
337337
EXPECT_EQ(testPath("x"), Commands.getValue().Directory);

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

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

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

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

5454
// Test with both capital letters
@@ -57,7 +57,7 @@ TEST(HeaderSourceSwitchTest, FileHeuristic) {
5757
FS.Files[Foo2C];
5858
FS.Files[Foo2HH];
5959
PathResult = getCorrespondingHeaderOrSource(Foo2C, FS.view(llvm::None));
60-
EXPECT_TRUE(PathResult.hasValue());
60+
EXPECT_TRUE(PathResult.has_value());
6161
ASSERT_EQ(PathResult.getValue(), Foo2HH);
6262

6363
// Test with source file as capital letter and .hxx header file
@@ -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());
70+
EXPECT_TRUE(PathResult.has_value());
7171
ASSERT_EQ(PathResult.getValue(), 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

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

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

105105
auto &RawFail = RawHandlers.MethodHandlers["fail"];
106106
RawFail(2, capture(Reply));
107-
ASSERT_TRUE(Reply.hasValue());
107+
ASSERT_TRUE(Reply.has_value());
108108
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::FailedWithMessage("X=2"));
109109

110110
auto &RawNotify = RawHandlers.NotificationHandlers["notify"];
@@ -117,7 +117,7 @@ TEST(LSPBinderTest, IncomingCalls) {
117117

118118
auto &RawCmdPlusOne = RawHandlers.CommandHandlers["cmdPlusOne"];
119119
RawCmdPlusOne(1, capture(Reply));
120-
ASSERT_TRUE(Reply.hasValue());
120+
ASSERT_TRUE(Reply.has_value());
121121
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::HasValue(2));
122122

123123
// None of this generated any outgoing traffic.
@@ -139,22 +139,22 @@ TEST(LSPBinderTest, OutgoingCalls) {
139139
llvm::Optional<llvm::Expected<Foo>> Reply;
140140
Echo(Foo{2}, capture(Reply));
141141
EXPECT_THAT(RawOutgoing.take("echo"), ElementsAre(llvm::json::Value(2)));
142-
ASSERT_TRUE(Reply.hasValue());
142+
ASSERT_TRUE(Reply.has_value());
143143
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::HasValue(Foo{2}));
144144

145145
// JSON response is integer, can't be parsed as string.
146146
llvm::Optional<llvm::Expected<std::string>> WrongTypeReply;
147147
WrongSignature(Foo{2}, capture(WrongTypeReply));
148148
EXPECT_THAT(RawOutgoing.take("wrongSignature"),
149149
ElementsAre(llvm::json::Value(2)));
150-
ASSERT_TRUE(Reply.hasValue());
150+
ASSERT_TRUE(Reply.has_value());
151151
EXPECT_THAT_EXPECTED(WrongTypeReply.getValue(),
152152
llvm::FailedWithMessage(
153153
HasSubstr("failed to decode wrongSignature reply")));
154154

155155
Fail(Foo{2}, capture(Reply));
156156
EXPECT_THAT(RawOutgoing.take("fail"), ElementsAre(llvm::json::Value(2)));
157-
ASSERT_TRUE(Reply.hasValue());
157+
ASSERT_TRUE(Reply.has_value());
158158
EXPECT_THAT_EXPECTED(Reply.getValue(), llvm::FailedWithMessage("Params=2"));
159159
}
160160

‎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

+4-4
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ class GLRReduce {
499499
FamilySequences.emplace_back(Sequences.top().first.Rule, *Push.Seq);
500500
for (const GSS::Node *Base : Push.LastPop->parents()) {
501501
auto NextState = Lang.Table.getGoToState(Base->State, F.Symbol);
502-
assert(NextState.hasValue() && "goto must succeed after reduce!");
502+
assert(NextState.has_value() && "goto must succeed after reduce!");
503503
FamilyBases.emplace_back(*NextState, Base);
504504
}
505505

@@ -555,7 +555,7 @@ class GLRReduce {
555555
const GSS::Node *Head = Heads->back();
556556
llvm::Optional<RuleID> RID;
557557
for (RuleID R : Lang.Table.getReduceRules(Head->State)) {
558-
if (RID.hasValue())
558+
if (RID.has_value())
559559
return false;
560560
RID = R;
561561
}
@@ -577,7 +577,7 @@ class GLRReduce {
577577
const ForestNode *Parsed =
578578
&Params.Forest.createSequence(Rule.Target, *RID, TempSequence);
579579
auto NextState = Lang.Table.getGoToState(Base->State, Rule.Target);
580-
assert(NextState.hasValue() && "goto must succeed after reduce!");
580+
assert(NextState.has_value() && "goto must succeed after reduce!");
581581
Heads->push_back(Params.GSStack.addNode(*NextState, Parsed, {Base}));
582582
return true;
583583
}
@@ -642,7 +642,7 @@ const ForestNode &glrParse(const ParseParams &Params, SymbolID StartSymbol,
642642

643643
// The parse was successful if we're in state `_ := start-symbol .`
644644
auto AcceptState = Lang.Table.getGoToState(StartState, StartSymbol);
645-
assert(AcceptState.hasValue() && "goto must succeed after start symbol!");
645+
assert(AcceptState.has_value() && "goto must succeed after start symbol!");
646646
auto SearchForAccept = [&](llvm::ArrayRef<const GSS::Node *> Heads) {
647647
const ForestNode *Result = nullptr;
648648
for (const auto *Head : Heads) {

‎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 && Actual->DefLoc.hasValue()) {
98+
EXPECT_EQ(Expected->DefLoc.has_value(), Actual->DefLoc.has_value());
99+
if (Expected->DefLoc && Actual->DefLoc.has_value()) {
100100
EXPECT_EQ(Expected->DefLoc->LineNumber, Actual->DefLoc->LineNumber);
101101
EXPECT_EQ(Expected->DefLoc->Filename, Actual->DefLoc->Filename);
102102
}

‎clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ TEST(ParseConfiguration, MergeConfigurations) {
129129
EXPECT_EQ("check1,check2,check3,check4", *Options.Checks);
130130
EXPECT_EQ("filter2", *Options.HeaderFilterRegex);
131131
EXPECT_EQ("user2", *Options.User);
132-
ASSERT_TRUE(Options.ExtraArgs.hasValue());
132+
ASSERT_TRUE(Options.ExtraArgs.has_value());
133133
EXPECT_EQ("arg1,arg2,arg3,arg4", llvm::join(Options.ExtraArgs->begin(),
134134
Options.ExtraArgs->end(), ","));
135-
ASSERT_TRUE(Options.ExtraArgsBefore.hasValue());
135+
ASSERT_TRUE(Options.ExtraArgsBefore.has_value());
136136
EXPECT_EQ("arg-before1,arg-before2,arg-before3,arg-before4",
137137
llvm::join(Options.ExtraArgsBefore->begin(),
138138
Options.ExtraArgsBefore->end(), ","));
139-
ASSERT_TRUE(Options.UseColor.hasValue());
139+
ASSERT_TRUE(Options.UseColor.has_value());
140140
EXPECT_TRUE(*Options.UseColor);
141141
}
142142

@@ -325,9 +325,9 @@ TEST(CheckOptionsValidation, ValidIntOptions) {
325325

326326
CHECK_VAL(TestCheck.getIntLocal("IntExpected"), 1);
327327
CHECK_VAL(TestCheck.getIntGlobal("GlobalIntExpected"), 1);
328-
EXPECT_FALSE(TestCheck.getIntLocal("IntInvalid1").hasValue());
329-
EXPECT_FALSE(TestCheck.getIntLocal("IntInvalid2").hasValue());
330-
EXPECT_FALSE(TestCheck.getIntGlobal("GlobalIntInvalid").hasValue());
328+
EXPECT_FALSE(TestCheck.getIntLocal("IntInvalid1").has_value());
329+
EXPECT_FALSE(TestCheck.getIntLocal("IntInvalid2").has_value());
330+
EXPECT_FALSE(TestCheck.getIntGlobal("GlobalIntInvalid").has_value());
331331
ASSERT_EQ(TestCheck.getIntLocal("DefaultedIntInvalid", 1), 1);
332332

333333
CHECK_VAL(TestCheck.getIntLocal<bool>("BoolITrueValue"), true);
@@ -395,14 +395,14 @@ TEST(ValidConfiguration, ValidEnumOptions) {
395395
/*IgnoreCase*/ true),
396396
Colours::Violet);
397397

398-
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("ValidWrongCase").hasValue());
399-
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("NearMiss").hasValue());
400-
EXPECT_FALSE(TestCheck.getIntGlobal<Colours>("GlobalInvalid").hasValue());
398+
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("ValidWrongCase").has_value());
399+
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("NearMiss").has_value());
400+
EXPECT_FALSE(TestCheck.getIntGlobal<Colours>("GlobalInvalid").has_value());
401401
EXPECT_FALSE(
402-
TestCheck.getIntGlobal<Colours>("GlobalValidWrongCase").hasValue());
403-
EXPECT_FALSE(TestCheck.getIntGlobal<Colours>("GlobalNearMiss").hasValue());
402+
TestCheck.getIntGlobal<Colours>("GlobalValidWrongCase").has_value());
403+
EXPECT_FALSE(TestCheck.getIntGlobal<Colours>("GlobalNearMiss").has_value());
404404

405-
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("Invalid").hasValue());
405+
EXPECT_FALSE(TestCheck.getIntLocal<Colours>("Invalid").has_value());
406406
EXPECT_THAT(
407407
DiagConsumer.take(),
408408
UnorderedElementsAre(

‎clang-tools-extra/unittests/clang-tidy/OptionsProviderTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ TEST(ClangTidyOptionsProvider, InMemoryFileSystems) {
5353
ClangTidyOptions File3Options =
5454
FileOpt.getOptions("ProjectRoot/SubDir1/SubDir2/SubDir3/File.cpp");
5555

56-
ASSERT_TRUE(File1Options.Checks.hasValue());
56+
ASSERT_TRUE(File1Options.Checks.has_value());
5757
EXPECT_EQ(*File1Options.Checks, "-*,clang-diagnostic-*,readability-*");
58-
ASSERT_TRUE(File2Options.Checks.hasValue());
58+
ASSERT_TRUE(File2Options.Checks.has_value());
5959
EXPECT_EQ(*File2Options.Checks, "bugprone-*,misc-*,clang-diagnostic-*");
6060

6161
// 2 and 3 should use the same config so these should also be the same.

‎clang/include/clang/APINotes/Types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CommonEntityInfo {
7676
}
7777

7878
void setSwiftPrivate(llvm::Optional<bool> Private) {
79-
SwiftPrivateSpecified = Private.hasValue();
79+
SwiftPrivateSpecified = Private.has_value();
8080
SwiftPrivate = Private ? *Private : 0;
8181
}
8282

‎clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ class CallEvent {
414414
bool isArgumentConstructedDirectly(unsigned Index) const {
415415
// This assumes that the object was not yet removed from the state.
416416
return ExprEngine::getObjectUnderConstruction(
417-
getState(), {getOriginExpr(), Index}, getLocationContext()).hasValue();
417+
getState(), {getOriginExpr(), Index}, getLocationContext())
418+
.has_value();
418419
}
419420

420421
/// Some calls have parameter numbering mismatched from argument numbering.

‎clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,11 @@ class ConditionTruthVal {
5959
bool isConstrainedFalse() const { return Val && !Val.getValue(); }
6060

6161
/// Return true if the constrained is perfectly constrained.
62-
bool isConstrained() const {
63-
return Val.hasValue();
64-
}
62+
bool isConstrained() const { return Val.has_value(); }
6563

6664
/// Return true if the constrained is underconstrained and we do not know
6765
/// if the constraint is true of value.
68-
bool isUnderconstrained() const {
69-
return !Val.hasValue();
70-
}
66+
bool isUnderconstrained() const { return !Val.has_value(); }
7167
};
7268

7369
class ConstraintManager {

‎clang/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class CachedFileSystemEntry {
9494
assert(!isDirectory() && "not a file");
9595
assert(Contents && "contents not initialized");
9696
if (auto *Directives = Contents->DepDirectives.load()) {
97-
if (Directives->hasValue())
97+
if (Directives->has_value())
9898
return ArrayRef<dependency_directives_scan::Directive>(
9999
Directives->getValue());
100100
}

‎clang/lib/Sema/SemaCodeComplete.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5362,8 +5362,8 @@ class ConceptInfo {
53625362
// Overwrite existing if the new member has more info.
53635363
// The preference of . vs :: vs -> is fairly arbitrary.
53645364
if (/*Inserted*/ R.second ||
5365-
std::make_tuple(M.ArgTypes.hasValue(), M.ResultType != nullptr,
5366-
M.Operator) > std::make_tuple(O.ArgTypes.hasValue(),
5365+
std::make_tuple(M.ArgTypes.has_value(), M.ResultType != nullptr,
5366+
M.Operator) > std::make_tuple(O.ArgTypes.has_value(),
53675367
O.ResultType != nullptr,
53685368
O.Operator))
53695369
O = std::move(M);

0 commit comments

Comments
 (0)