<div dir="ltr">Thank you for fixing this...</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Sep 26, 2019 at 3:00 AM Fangrui Song via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: maskray<br>
Date: Wed Sep 25 19:02:17 2019<br>
New Revision: 372939<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=372939&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=372939&view=rev</a><br>
Log:<br>
[clang-format] Add SortPriority fields to fix -Wmissing-field-initializers after D64695/r372919<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/Format.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=372939&r1=372938&r2=372939&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=372939&r1=372938&r2=372939&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Wed Sep 25 19:02:17 2019<br>
@@ -734,9 +734,9 @@ FormatStyle getLLVMStyle(FormatStyle::La<br>
   LLVMStyle.ForEachMacros.push_back("Q_FOREACH");<br>
   LLVMStyle.ForEachMacros.push_back("BOOST_FOREACH");<br>
   LLVMStyle.IncludeStyle.IncludeCategories = {<br>
-      {"^\"(llvm|llvm-c|clang|clang-c)/", 2},<br>
-      {"^(<|\"(gtest|gmock|isl|json)/)", 3},<br>
-      {".*", 1}};<br>
+      {"^\"(llvm|llvm-c|clang|clang-c)/", 2, 0},<br>
+      {"^(<|\"(gtest|gmock|isl|json)/)", 3, 0},<br>
+      {".*", 1, 0}};<br>
   LLVMStyle.IncludeStyle.IncludeIsMainRegex = "(Test)?$";<br>
   LLVMStyle.IncludeStyle.IncludeBlocks = tooling::IncludeStyle::IBS_Preserve;<br>
   LLVMStyle.IndentCaseLabels = false;<br>
@@ -818,8 +818,10 @@ FormatStyle getGoogleStyle(FormatStyle::<br>
   GoogleStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;<br>
   GoogleStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true;<br>
   GoogleStyle.DerivePointerAlignment = true;<br>
-  GoogleStyle.IncludeStyle.IncludeCategories = {<br>
-      {"^<ext/.*\\.h>", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}};<br>
+  GoogleStyle.IncludeStyle.IncludeCategories = {{"^<ext/.*\\.h>", 2, 0},<br>
+                                                {"^<.*\\.h>", 1, 0},<br>
+                                                {"^<.*", 2, 0},<br>
+                                                {".*", 3, 0}};<br>
   GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$";<br>
   GoogleStyle.IncludeStyle.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;<br>
   GoogleStyle.IndentCaseLabels = true;<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=372939&r1=372938&r2=372939&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=372939&r1=372938&r2=372939&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Sep 25 19:02:17 2019<br>
@@ -12463,7 +12463,7 @@ TEST_F(FormatTest, ParsesConfiguration)<br>
<br>
   Style.IncludeStyle.IncludeCategories.clear();<br>
   std::vector<tooling::IncludeStyle::IncludeCategory> ExpectedCategories = {<br>
-      {"abc/.*", 2}, {".*", 1}};<br>
+      {"abc/.*", 2, 0}, {".*", 1, 0}};<br>
   CHECK_PARSE("IncludeCategories:\n"<br>
               "  - Regex: abc/.*\n"<br>
               "    Priority: 2\n"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>