Skip to content

Commit 9d86ca8

Browse files
committed
Review comments
1 parent 296b9b1 commit 9d86ca8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

clang/lib/Format/Format.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,6 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
17531753
GoogleStyle.AttributeMacros.push_back("absl_nullable");
17541754
GoogleStyle.AttributeMacros.push_back("absl_nullability_unknown");
17551755
GoogleStyle.BreakTemplateDeclarations = FormatStyle::BTDS_Yes;
1756-
GoogleStyle.DerivePointerAlignment = false;
17571756
GoogleStyle.IncludeStyle.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
17581757
GoogleStyle.IncludeStyle.IncludeCategories = {{"^<ext/.*\\.h>", 2, 0, false},
17591758
{"^<.*\\.h>", 1, 0, false},

clang/unittests/Format/FormatTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12287,7 +12287,6 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
1228712287
" aaaaaaaaaaaaaaaaaaaaaaaaaaaa, *aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
1228812288

1228912289
verifyGoogleFormat("int const* a = &b;");
12290-
verifyFormat("int const* a = &b;", "int const *a = &b;", getGoogleStyle());
1229112290
verifyGoogleFormat("**outparam = 1;");
1229212291
verifyGoogleFormat("*outparam = a * b;");
1229312292
verifyGoogleFormat("int main(int argc, char** argv) {}");
@@ -12892,7 +12891,8 @@ TEST_F(FormatTest, UnderstandsEllipsis) {
1289212891
}
1289312892

1289412893
TEST_F(FormatTest, AdaptivelyFormatsPointersAndReferences) {
12895-
FormatStyle Style = getLLVMStyle();
12894+
auto Style = getGoogleStyle();
12895+
EXPECT_FALSE(Style.DerivePointerAlignment);
1289612896
Style.DerivePointerAlignment = true;
1289712897

1289812898
verifyFormat("int *a;\n"

0 commit comments

Comments
 (0)