Bug #29588949: UPGRADE TO CLANG-FORMAT 8

Upgrade clang-format settings from 5.0 to 8, and rerun it over the entire code base. The real committer is Steinar H. Gunderson <[email protected]>, but the author has been set to Anonymous Reformatter so that git blame won't show myself as author of all existing code. To ignore whitespace changes caused by this commit, please use git blame -w. For ignoring larger changes, you can run blame on the commit immediately preceding this, as follows: git blame clang-format-8-base^ -- path/to/file.cc Change-Id: Ia6fe3de72ab6e760b678305175204f216185fa89
zwang28 · Apr 2, 2019 · 4f7fc7f · 4f7fc7f
1 parent 0d77e99
commit 4f7fc7f
Show file tree

Hide file tree

Showing 338 changed files with 2,157 additions and 2,145 deletions.
diff --git a/.clang-format b/.clang-format
@@ -20,11 +20,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-# This is the output of clang-format-5.0 --style=google --dump-config,
+# This is the output of clang-format-8 --style=google --dump-config,
 # except for changes mentioned below. We lock the style so that any newer
 # version of clang-format will give the same result; as time goes, we may
 # update this list, requiring newer versions of clang-format.
 
+---
 Language:        Cpp
 # BasedOnStyle:  Google
 AccessModifierOffset: -1
@@ -43,7 +44,7 @@ AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:   
@@ -55,6 +56,7 @@ BraceWrapping:
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
+  AfterExternBlock: false
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
@@ -64,6 +66,7 @@ BraceWrapping:
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
@@ -83,7 +86,10 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IncludeBlocks:   Preserve
 IncludeCategories: 
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        2
   - Regex:           '^<.*\.h>'
     Priority:        1
   - Regex:           '^<.*'
@@ -92,6 +98,7 @@ IncludeCategories:
     Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
+IndentPPDirectives: None
 IndentWidth:     2
 IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave
@@ -101,30 +108,67 @@ MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
+ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
+RawStringFormats: 
+  - Language:        Cpp
+    Delimiters:      
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+  - Language:        TextProto
+    Delimiters:      
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions: 
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
 ReflowComments:  true
 SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
 SpacesInAngles:  false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
+StatementMacros: 
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
 TabWidth:        8
 UseTab:          Never
 
@@ -133,5 +177,5 @@ UseTab:          Never
 DerivePointerAlignment: false
 PointerAlignment: Right
 
-# MySQL source code is allowed to use C++11 features.
+# MySQL source code is allowed to use C++11 (and C++14) features.
 Standard:        Cpp11
diff --git a/client/base/help_options.cc b/client/base/help_options.cc
@@ -36,8 +36,8 @@
 
 using namespace Mysql::Tools::Base::Options;
 using Mysql::Tools::Base::Abstract_program;
-using std::placeholders::_1;
 using std::string;
+using std::placeholders::_1;
 
 extern const char *load_default_groups[];
 

diff --git a/client/base/mysql_connection_options.cc b/client/base/mysql_connection_options.cc
@@ -39,9 +39,9 @@
 using Mysql::Nullable;
 using Mysql::Tools::Base::Abstract_program;
 using namespace Mysql::Tools::Base::Options;
-using std::placeholders::_1;
 using std::string;
 using std::vector;
+using std::placeholders::_1;
 
 bool Mysql_connection_options::mysql_inited;
 

diff --git a/client/base/mysql_query_runner.cc b/client/base/mysql_query_runner.cc
@@ -34,9 +34,9 @@
 #include "template_utils.h"
 
 using namespace Mysql::Tools::Base;
-using std::placeholders::_1;
 using std::string;
 using std::vector;
+using std::placeholders::_1;
 
 Mysql_query_runner::Mysql_query_runner(MYSQL *connection)
     : m_is_processing(new std::atomic<bool>(false)),

diff --git a/client/base/password_option.cc b/client/base/password_option.cc
@@ -31,8 +31,8 @@
 
 using namespace Mysql::Tools::Base::Options;
 using Mysql::Nullable;
-using std::placeholders::_1;
 using std::string;
+using std::placeholders::_1;
 
 Password_option::Password_option(Nullable<string> *value, string name,
                                  string description)

diff --git a/client/base/show_variable_query_extractor.cc b/client/base/show_variable_query_extractor.cc
@@ -27,9 +27,9 @@
 #include <functional>
 
 using namespace Mysql::Tools::Base;
-using std::placeholders::_1;
 using std::string;
 using std::vector;
+using std::placeholders::_1;
 
 Show_variable_query_extractor::Show_variable_query_extractor()
     : m_exists(false) {}

diff --git a/client/dump/mysql_object_reader_options.h b/client/dump/mysql_object_reader_options.h
@@ -46,7 +46,7 @@ class Mysql_object_reader_options
   uint64 m_row_group_size;
   const Mysql_chain_element_options *m_mysql_chain_element_options;
 };
-}
+}  // namespace Dump
 }  // namespace Tools
 }  // namespace Mysql
 

diff --git a/client/mysql.cc b/client/mysql.cc
@@ -2574,9 +2574,9 @@ static bool add_line(String &buffer, char *line, size_t line_length,
   DBUG_RETURN(0);
 }
 
-  /*****************************************************************
-              Interface to Readline Completion
-  ******************************************************************/
+/*****************************************************************
+            Interface to Readline Completion
+******************************************************************/
 
 #ifdef HAVE_READLINE
 
@@ -2838,7 +2838,7 @@ You can turn off this feature to get a quicker startup with -A\n\n");
   DBUG_VOID_RETURN;
 }
 
-  /* for gnu readline */
+/* for gnu readline */
 
 #ifndef HAVE_INDEX
 extern "C" {
@@ -3937,9 +3937,9 @@ static int com_notee(String *buffer MY_ATTRIBUTE((unused)),
   return 0;
 }
 
-  /*
-    Sorry, this command is not available in Windows.
-  */
+/*
+  Sorry, this command is not available in Windows.
+*/
 
 #ifdef USE_POPEN
 static int com_pager(String *buffer MY_ATTRIBUTE((unused)),
@@ -3987,9 +3987,9 @@ static int com_nopager(String *buffer MY_ATTRIBUTE((unused)),
 }
 #endif
 
-  /*
-    Sorry, you can't send the result to an editor in Win32
-  */
+/*
+  Sorry, you can't send the result to an editor in Win32
+*/
 
 #ifdef USE_POPEN
 static int com_edit(String *buffer, char *line MY_ATTRIBUTE((unused))) {

diff --git a/client/mysql_config_editor.cc b/client/mysql_config_editor.cc
@@ -665,11 +665,11 @@ static bool check_and_create_login_file(void) {
     goto error;
   }
 
-    /*
-      NOTE : MYSQL_TEST_LOGIN_FILE env must be a full path,
-      where the directory structure must exist. However the
-      login file will be created if it does not exist.
-    */
+  /*
+    NOTE : MYSQL_TEST_LOGIN_FILE env must be a full path,
+    where the directory structure must exist. However the
+    login file will be created if it does not exist.
+  */
 #ifdef _WIN32
   if (!(getenv("MYSQL_TEST_LOGIN_FILE"))) {
     /* Check if 'MySQL' directory is in place. */

diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
@@ -1014,7 +1014,7 @@ static int execute_commands(MYSQL *mysql, int argc, char **argv) {
           */
         }
 
-          /* Warn about password being set in non ssl connection */
+        /* Warn about password being set in non ssl connection */
 #if defined(HAVE_OPENSSL)
         {
           uint ssl_mode = 0;

diff --git a/client/mysqldump.cc b/client/mysqldump.cc
@@ -5545,10 +5545,10 @@ static bool get_view_structure(char *table, char *db) {
   DBUG_RETURN(0);
 }
 
-  /*
-    The following functions are wrappers for the dynamic string functions
-    and if they fail, the wrappers will terminate the current process.
-  */
+/*
+  The following functions are wrappers for the dynamic string functions
+  and if they fail, the wrappers will terminate the current process.
+*/
 
 #define DYNAMIC_STR_ERROR_MSG "Couldn't perform DYNAMIC_STRING operation"
 

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -1958,16 +1958,16 @@ static int run_tool(const char *tool_path, DYNAMIC_STRING *ds_res, ...) {
   DBUG_RETURN(ret);
 }
 
-  /*
-    Test if diff is present.  This is needed on Windows systems
-    as the OS returns 1 whether diff is successful or if it is
-    not present.
-
-    We run diff -v and look for output in stdout.
-    We don't redirect stderr to stdout to make for a simplified check
-    Windows will output '"diff"' is not recognized... to stderr if it is
-    not present.
-  */
+/*
+  Test if diff is present.  This is needed on Windows systems
+  as the OS returns 1 whether diff is successful or if it is
+  not present.
+
+  We run diff -v and look for output in stdout.
+  We don't redirect stderr to stdout to make for a simplified check
+  Windows will output '"diff"' is not recognized... to stderr if it is
+  not present.
+*/
 
 #ifdef _WIN32
 
@@ -10470,14 +10470,14 @@ void replace_strings_append(REPLACE *rep, DYNAMIC_STRING *ds, const char *str,
   }
 }
 
-  /*
-    Regex replace  functions
-  */
+/*
+  Regex replace  functions
+*/
 
-  /*
-    Finds the next (non-escaped) '/' in the expression.
-    (If the character '/' is needed, it can be escaped using '\'.)
-  */
+/*
+  Finds the next (non-escaped) '/' in the expression.
+  (If the character '/' is needed, it can be escaped using '\'.)
+*/
 
 #define PARSE_REGEX_ARG     \
   while (p < expr_end) {    \
@@ -11163,9 +11163,9 @@ uint end_of_word(const char *pos) {
              : 0;
 }
 
-  /****************************************************************************
-   * Handle replacement of strings
-   ****************************************************************************/
+/****************************************************************************
+ * Handle replacement of strings
+ ****************************************************************************/
 
 #define PC_MALLOC 256 /* Bytes for pointers */
 #define PS_MALLOC 512 /* Bytes for data */