Skip to content

[clang-tools-extra] Use {} instead of std::nullopt to initialize empty ArrayRef #109400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2024
Merged

[clang-tools-extra] Use {} instead of std::nullopt to initialize empty ArrayRef #109400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebffad8
[clang-tools-extra] Use {} instead of std::nullopt to initialize empt…
jayfoad Sep 20, 2024
49165b5
clang-format
jayfoad Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-query/Query.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
TD.emitDiagnostic(
FullSourceLoc(R.getBegin(), AST->getSourceManager()),
DiagnosticsEngine::Note, "\"" + BI->first + "\" binds here",
CharSourceRange::getTokenRange(R), std::nullopt);
CharSourceRange::getTokenRange(R), {});
}
}
if (QS.PrintOutput) {
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ template <typename... CheckTypes>
std::string
runCheckOnCode(StringRef Code, std::vector<ClangTidyError> *Errors = nullptr,
const Twine &Filename = "input.cc",
ArrayRef<std::string> ExtraArgs = std::nullopt,
ArrayRef<std::string> ExtraArgs = {},
const ClangTidyOptions &ExtraOptions = ClangTidyOptions(),
std::map<StringRef, StringRef> PathsToContent =
std::map<StringRef, StringRef>()) {
Expand Down
68 changes: 31 additions & 37 deletions clang-tools-extra/unittests/clang-tidy/IncludeCleanerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST(IncludeCleanerCheckTest, BasicUnusedIncludes) {
std::vector<ClangTidyError> Errors;
EXPECT_EQ(PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"bar.h", "#pragma once"}, {"vector", "#pragma once"}}));
}

Expand Down Expand Up @@ -78,7 +78,7 @@ TEST(IncludeCleanerCheckTest, SuppressUnusedIncludes) {
EXPECT_EQ(
PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, Opts,
PreCode, &Errors, "file.cpp", {}, Opts,
{{"bar.h", "#pragma once"},
{"vector", "#pragma once"},
{"list", "#pragma once"},
Expand All @@ -103,14 +103,13 @@ int BazResult = baz();
)";

std::vector<ClangTidyError> Errors;
EXPECT_EQ(PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
EXPECT_EQ(PostCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
#include "baz.h"
int bar();
)"},
{"baz.h", R"(#pragma once
{"baz.h", R"(#pragma once
int baz();
)"}}));
}
Expand All @@ -124,8 +123,8 @@ int BarResult2 = $diag2^bar();)");

{
std::vector<ClangTidyError> Errors;
runCheckOnCode<IncludeCleanerCheck>(Code.code(), &Errors, "file.cpp",
std::nullopt, ClangTidyOptions(),
runCheckOnCode<IncludeCleanerCheck>(Code.code(), &Errors, "file.cpp", {},
ClangTidyOptions(),
{{"baz.h", R"(#pragma once
#include "bar.h"
)"},
Expand All @@ -141,8 +140,8 @@ int BarResult2 = $diag2^bar();)");
std::vector<ClangTidyError> Errors;
ClangTidyOptions Opts;
Opts.CheckOptions.insert({"DeduplicateFindings", "false"});
runCheckOnCode<IncludeCleanerCheck>(Code.code(), &Errors, "file.cpp",
std::nullopt, Opts,
runCheckOnCode<IncludeCleanerCheck>(Code.code(), &Errors, "file.cpp", {},
Opts,
{{"baz.h", R"(#pragma once
#include "bar.h"
)"},
Expand Down Expand Up @@ -176,7 +175,7 @@ std::vector x;
llvm::Regex::escape(appendPathFileSystemIndependent({"foo", "qux.h"}))};
std::vector<ClangTidyError> Errors;
EXPECT_EQ(PreCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, Opts,
PreCode, &Errors, "file.cpp", {}, Opts,
{{"bar.h", R"(#pragma once
#include "baz.h"
#include "foo/qux.h"
Expand Down Expand Up @@ -215,14 +214,13 @@ int BazResult_1 = baz_1();
)";

std::vector<ClangTidyError> Errors;
EXPECT_EQ(PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
EXPECT_EQ(PostCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
#include "baz.h"
int bar();
)"},
{"baz.h", R"(#pragma once
{"baz.h", R"(#pragma once
int baz_0();
int baz_1();
)"}}));
Expand All @@ -244,13 +242,12 @@ std::vector Vec;
)";

std::vector<ClangTidyError> Errors;
EXPECT_EQ(PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"string", R"(#pragma once
EXPECT_EQ(PostCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"string", R"(#pragma once
namespace std { class string {}; }
)"},
{"vector", R"(#pragma once
{"vector", R"(#pragma once
#include <string>
namespace std { class vector {}; }
)"}}));
Expand All @@ -272,14 +269,13 @@ int FooBarResult = foobar();
)";

std::vector<ClangTidyError> Errors;
EXPECT_EQ(PostCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
EXPECT_EQ(PostCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"bar.h", R"(#pragma once
#include "private.h"
int bar();
)"},
{"private.h", R"(#pragma once
{"private.h", R"(#pragma once
// IWYU pragma: private, include "public.h"
int foobar();
)"}}));
Expand All @@ -295,11 +291,10 @@ DECLARE(myfunc) {
)";

std::vector<ClangTidyError> Errors;
EXPECT_EQ(PreCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"foo.h",
R"(#pragma once
EXPECT_EQ(PreCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"foo.h",
R"(#pragma once
#define DECLARE(X) void X()
)"}}));

Expand All @@ -311,11 +306,10 @@ DECLARE {
}
)";

EXPECT_EQ(PreCode,
runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", std::nullopt, ClangTidyOptions(),
{{"foo.h",
R"(#pragma once
EXPECT_EQ(PreCode, runCheckOnCode<IncludeCleanerCheck>(
PreCode, &Errors, "file.cpp", {}, ClangTidyOptions(),
{{"foo.h",
R"(#pragma once
#define DECLARE void myfunc()
)"}}));
}
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class ObjCGeneratedHeaderInserterCheck : public IncludeInserterCheckBase {
template <typename Check>
std::string runCheckOnCode(StringRef Code, StringRef Filename) {
std::vector<ClangTidyError> Errors;
return test::runCheckOnCode<Check>(Code, &Errors, Filename, std::nullopt,
return test::runCheckOnCode<Check>(Code, &Errors, Filename, {},
ClangTidyOptions(),
{// Main file include
{"clang_tidy/tests/"
Expand Down
5 changes: 2 additions & 3 deletions clang-tools-extra/unittests/clang-tidy/NamespaceAliaserTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ std::string runChecker(StringRef Code, unsigned ExpectedWarningCount) {
"}"}};
std::vector<ClangTidyError> errors;

std::string result =
test::runCheckOnCode<Check>(Code, &errors, "foo.cc", std::nullopt,
ClangTidyOptions(), AdditionalFileContents);
std::string result = test::runCheckOnCode<Check>(
Code, &errors, "foo.cc", {}, ClangTidyOptions(), AdditionalFileContents);

EXPECT_EQ(ExpectedWarningCount, errors.size());
return result;
Expand Down
7 changes: 3 additions & 4 deletions clang-tools-extra/unittests/clang-tidy/ReadabilityModuleTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ TEST(BracesAroundStatementsCheckTest, IfElseWithShortStatements) {
" else if (1 == 2) return -2;\n"
" else return -3;\n"
"}",
nullptr, "input.cc", std::nullopt, Options));
nullptr, "input.cc", {}, Options));

// If the last else is an else-if, we also force it.
EXPECT_EQ("int main() {\n"
Expand All @@ -269,7 +269,7 @@ TEST(BracesAroundStatementsCheckTest, IfElseWithShortStatements) {
" if (false) return -1;\n"
" else if (1 == 2) return -2;\n"
"}",
nullptr, "input.cc", std::nullopt, Options));
nullptr, "input.cc", {}, Options));
}

TEST(BracesAroundStatementsCheckTest, For) {
Expand Down Expand Up @@ -484,8 +484,7 @@ TEST(BracesAroundStatementsCheckTest, Macros) {
}

#define EXPECT_NO_CHANGES_WITH_OPTS(Check, Opts, Code) \
EXPECT_EQ(Code, runCheckOnCode<Check>(Code, nullptr, "input.cc", \
std::nullopt, Opts))
EXPECT_EQ(Code, runCheckOnCode<Check>(Code, nullptr, "input.cc", {}, Opts))
TEST(BracesAroundStatementsCheckTest, ImplicitCastInReturn) {
ClangTidyOptions Opts;
Opts.CheckOptions["test-check-0.ShortStatementLines"] = "1";
Expand Down
52 changes: 26 additions & 26 deletions clang-tools-extra/unittests/clang-tidy/TransformerClangTidyCheckTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ TEST(TransformerClangTidyCheckTest, DisableByConfig) {

Options.CheckOptions["test-check-0.Skip"] = "true";
EXPECT_EQ(Input, test::runCheckOnCode<ConfigurableCheck>(
Input, nullptr, "input.cc", std::nullopt, Options));
Input, nullptr, "input.cc", {}, Options));

Options.CheckOptions["test-check-0.Skip"] = "false";
EXPECT_EQ(Expected, test::runCheckOnCode<ConfigurableCheck>(
Input, nullptr, "input.cc", std::nullopt, Options));
Input, nullptr, "input.cc", {}, Options));
}

RewriteRuleWith<std::string> replaceCall(IncludeFormat Format) {
Expand Down Expand Up @@ -346,20 +346,20 @@ int h(int x) { return 5; })cc";
ClangTidyOptions Options;
std::map<StringRef, StringRef> PathsToContent = {{"input.h", "\n"}};
Options.CheckOptions["test-check-0.IncludeStyle"] = "llvm";
EXPECT_EQ(TreatsAsLibraryHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cpp",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cpp",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cpp", {}, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cpp", {}, Options, PathsToContent));

Options.CheckOptions["test-check-0.IncludeStyle"] = "google";
EXPECT_EQ(TreatsAsNormalHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cc",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cc",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cc", {}, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cc", {}, Options, PathsToContent));
}

TEST(TransformerClangTidyCheckTest, AddIncludeObeysSortStyleGlobalOption) {
Expand All @@ -378,20 +378,20 @@ int h(int x) { return 5; })cc";
ClangTidyOptions Options;
std::map<StringRef, StringRef> PathsToContent = {{"input.h", "\n"}};
Options.CheckOptions["IncludeStyle"] = "llvm";
EXPECT_EQ(TreatsAsLibraryHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cpp",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cpp",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cpp", {}, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cpp", {}, Options, PathsToContent));

Options.CheckOptions["IncludeStyle"] = "google";
EXPECT_EQ(TreatsAsNormalHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cc",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader, test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cc",
std::nullopt, Options, PathsToContent));
EXPECT_EQ(TreatsAsNormalHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "inputTest.cc", {}, Options, PathsToContent));
EXPECT_EQ(TreatsAsLibraryHeader,
test::runCheckOnCode<IncludeOrderCheck>(
Input, nullptr, "input_test.cc", {}, Options, PathsToContent));
}

} // namespace
Expand Down
5 changes: 2 additions & 3 deletions clang-tools-extra/unittests/clang-tidy/UsingInserterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ std::string runChecker(StringRef Code, unsigned ExpectedWarningCount) {
"}"}};
std::vector<ClangTidyError> errors;

std::string result =
test::runCheckOnCode<Check>(Code, &errors, "foo.cc", std::nullopt,
ClangTidyOptions(), AdditionalFileContents);
std::string result = test::runCheckOnCode<Check>(
Code, &errors, "foo.cc", {}, ClangTidyOptions(), AdditionalFileContents);

EXPECT_EQ(ExpectedWarningCount, errors.size());
return result;
Expand Down
Loading