Skip to content

Commit 2e0cda0

Browse files
committed
reduce noise
1 parent bcc74bb commit 2e0cda0

File tree

1 file changed

+30
-35
lines changed

1 file changed

+30
-35
lines changed

clang/unittests/Tooling/ToolingTest.cpp

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,15 @@ class TestAction : public clang::ASTFrontendAction {
5757
};
5858

5959
class FindTopLevelDeclConsumer : public clang::ASTConsumer {
60-
public:
60+
public:
6161
explicit FindTopLevelDeclConsumer(bool *FoundTopLevelDecl)
6262
: FoundTopLevelDecl(FoundTopLevelDecl) {}
6363
bool HandleTopLevelDecl(clang::DeclGroupRef DeclGroup) override {
6464
*FoundTopLevelDecl = true;
6565
return true;
6666
}
67-
68-
private:
69-
bool *const FoundTopLevelDecl;
67+
private:
68+
bool * const FoundTopLevelDecl;
7069
};
7170
} // end namespace
7271

@@ -81,27 +80,26 @@ TEST(runToolOnCode, FindsNoTopLevelDeclOnEmptyCode) {
8180

8281
namespace {
8382
class FindClassDeclXConsumer : public clang::ASTConsumer {
84-
public:
83+
public:
8584
FindClassDeclXConsumer(bool *FoundClassDeclX)
8685
: FoundClassDeclX(FoundClassDeclX) {}
8786
bool HandleTopLevelDecl(clang::DeclGroupRef GroupRef) override {
88-
if (CXXRecordDecl *Record =
89-
dyn_cast<clang::CXXRecordDecl>(*GroupRef.begin())) {
87+
if (CXXRecordDecl* Record = dyn_cast<clang::CXXRecordDecl>(
88+
*GroupRef.begin())) {
9089
if (Record->getName() == "X") {
9190
*FoundClassDeclX = true;
9291
}
9392
}
9493
return true;
9594
}
96-
97-
private:
95+
private:
9896
bool *FoundClassDeclX;
9997
};
10098
bool FindClassDeclX(ASTUnit *AST) {
10199
for (std::vector<Decl *>::iterator i = AST->top_level_begin(),
102100
e = AST->top_level_end();
103101
i != e; ++i) {
104-
if (CXXRecordDecl *Record = dyn_cast<clang::CXXRecordDecl>(*i)) {
102+
if (CXXRecordDecl* Record = dyn_cast<clang::CXXRecordDecl>(*i)) {
105103
if (Record->getName() == "X") {
106104
return true;
107105
}
@@ -566,27 +564,25 @@ TEST(runToolOnCode, TestSkipFunctionBody) {
566564
std::make_unique<SkipBodyAction>(),
567565
"struct skipMe { skipMe() : an_error() { more error } };", Args));
568566
EXPECT_TRUE(runToolOnCodeWithArgs(
569-
std::make_unique<SkipBodyAction>(),
570-
"struct skipMe { skipMe(); };"
571-
"skipMe::skipMe() : an_error([](){;}) { more error }",
567+
std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe(); };"
568+
"skipMe::skipMe() : an_error([](){;}) { more error }",
572569
Args));
573570
EXPECT_TRUE(runToolOnCodeWithArgs(
574-
std::make_unique<SkipBodyAction>(),
575-
"struct skipMe { skipMe(); };"
576-
"skipMe::skipMe() : an_error{[](){;}} { more error }",
571+
std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe(); };"
572+
"skipMe::skipMe() : an_error{[](){;}} { more error }",
577573
Args));
578574
EXPECT_TRUE(runToolOnCodeWithArgs(
579575
std::make_unique<SkipBodyAction>(),
580576
"struct skipMe { skipMe(); };"
581577
"skipMe::skipMe() : a<b<c>(e)>>(), f{}, g() { error }",
582578
Args));
583579
EXPECT_TRUE(runToolOnCodeWithArgs(
584-
std::make_unique<SkipBodyAction>(),
585-
"struct skipMe { skipMe() : bases()... { error } };", Args));
580+
std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe() : bases()... { error } };",
581+
Args));
586582

587583
EXPECT_FALSE(runToolOnCodeWithArgs(
588-
std::make_unique<SkipBodyAction>(),
589-
"struct skipMeNot { skipMeNot() : an_error() { } };", Args));
584+
std::make_unique<SkipBodyAction>(), "struct skipMeNot { skipMeNot() : an_error() { } };",
585+
Args));
590586
EXPECT_FALSE(runToolOnCodeWithArgs(std::make_unique<SkipBodyAction>(),
591587
"struct skipMeNot { skipMeNot(); };"
592588
"skipMeNot::skipMeNot() : an_error() { }",
@@ -608,10 +604,9 @@ TEST(runToolOnCode, TestSkipFunctionBody) {
608604
"void skipMe() try something;")); // don't crash while parsing
609605

610606
// Template
611-
EXPECT_TRUE(
612-
runToolOnCode(std::make_unique<SkipBodyAction>(),
613-
"template<typename T> int skipMe() { an_error_here }"
614-
"int x = skipMe<int>();"));
607+
EXPECT_TRUE(runToolOnCode(
608+
std::make_unique<SkipBodyAction>(), "template<typename T> int skipMe() { an_error_here }"
609+
"int x = skipMe<int>();"));
615610
EXPECT_FALSE(runToolOnCodeWithArgs(
616611
std::make_unique<SkipBodyAction>(),
617612
"template<typename T> int skipMeNot() { an_error_here }", Args2));
@@ -632,8 +627,7 @@ TEST(runToolOnCodeWithArgs, TestNoDepFile) {
632627
Args.push_back(std::string(DepFilePath.str()));
633628
Args.push_back("-MF");
634629
Args.push_back(std::string(DepFilePath.str()));
635-
EXPECT_TRUE(
636-
runToolOnCodeWithArgs(std::make_unique<SkipBodyAction>(), "", Args));
630+
EXPECT_TRUE(runToolOnCodeWithArgs(std::make_unique<SkipBodyAction>(), "", Args));
637631
EXPECT_FALSE(llvm::sys::fs::exists(DepFilePath.str()));
638632
EXPECT_FALSE(llvm::sys::fs::remove(DepFilePath.str()));
639633
}
@@ -691,11 +685,11 @@ TEST(ClangToolTest, ArgumentAdjusters) {
691685
bool Ran = false;
692686
ArgumentsAdjuster CheckSyntaxOnlyAdjuster =
693687
[&Found, &Ran](const CommandLineArguments &Args, StringRef /*unused*/) {
694-
Ran = true;
695-
if (llvm::is_contained(Args, "-fsyntax-only"))
696-
Found = true;
697-
return Args;
698-
};
688+
Ran = true;
689+
if (llvm::is_contained(Args, "-fsyntax-only"))
690+
Found = true;
691+
return Args;
692+
};
699693
Tool.appendArgumentsAdjuster(CheckSyntaxOnlyAdjuster);
700694
Tool.run(Action.get());
701695
EXPECT_TRUE(Ran);
@@ -799,10 +793,10 @@ TEST(ClangToolTest, StripDependencyFileAdjuster) {
799793

800794
CommandLineArguments FinalArgs;
801795
ArgumentsAdjuster CheckFlagsAdjuster =
802-
[&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
803-
FinalArgs = Args;
804-
return Args;
805-
};
796+
[&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
797+
FinalArgs = Args;
798+
return Args;
799+
};
806800
Tool.clearArgumentsAdjusters();
807801
Tool.appendArgumentsAdjuster(getClangStripDependencyFileAdjuster());
808802
Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
@@ -1172,5 +1166,6 @@ TEST(ClangToolTest, ProgressReportMixed) {
11721166
"[3/3] Processing file " + std::string(NativeFile3) + ".\n";
11731167
EXPECT_EQ(Output, Expected);
11741168
}
1169+
11751170
} // end namespace tooling
11761171
} // end namespace clang

0 commit comments

Comments
 (0)