Run llvm/utils/sort_includes.py over the Clang tools code. This doesn't

always produce as pretty of results as it does in LLVM and Clang, but
I don't mind and the value of having a single canonical ordering is very
high IMO.

Let me know if you spot really serious problems here.

llvm-svn: 198703

clang-tools-extra/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h

@@ -20,8 +20,8 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/system_error.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace clang {
 

clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp

@@ -16,7 +16,6 @@
 #include "AddOverride.h"
 #include "AddOverrideActions.h"
 #include "AddOverrideMatchers.h"
-
 #include "clang/Frontend/CompilerInstance.h"
 
 using clang::ast_matchers::MatchFinder;

clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.cpp

@@ -16,11 +16,10 @@
 #include "AddOverrideActions.h"
 #include "AddOverrideMatchers.h"
 #include "Core/Transform.h"
-
-#include "clang/Basic/CharInfo.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Attr.h"
 #include "clang/AST/RecursiveASTVisitor.h"
+#include "clang/Basic/CharInfo.h"
 #include "clang/Lex/Lexer.h"
 #include "clang/Lex/Preprocessor.h"
 

clang-tools-extra/clang-modernize/Core/IncludeDirectives.h

@@ -19,8 +19,8 @@
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Tooling/Refactoring.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/StringRef.h"
 #include <vector>
 
 namespace clang {

clang-tools-extra/clang-modernize/Core/PerfSupport.cpp

@@ -15,9 +15,9 @@
 #include "PerfSupport.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Format.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Process.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/Process.h"
+#include "llvm/Support/raw_ostream.h"
 
 void collectSourcePerfData(const Transform &T, SourcePerfData &Data) {
   for (Transform::TimingVec::const_iterator I = T.timing_begin(),

clang-tools-extra/clang-modernize/Core/PerfSupport.h

@@ -18,7 +18,6 @@
 
 #include "Transform.h"
 #include "llvm/ADT/StringRef.h"
-
 #include <map>
 #include <vector>
 

clang-tools-extra/clang-modernize/Core/ReplacementHandling.h

@@ -16,8 +16,8 @@
 #ifndef CLANG_MODERNIZE_REPLACEMENTHANDLING_H
 #define CLANG_MODERNIZE_REPLACEMENTHANDLING_H
 
-#include "llvm/ADT/StringRef.h"
 #include "Core/Transform.h"
+#include "llvm/ADT/StringRef.h"
 
 class ReplacementHandling {
 public:

clang-tools-extra/clang-modernize/Core/Transforms.h

@@ -17,9 +17,8 @@
 #ifndef CLANG_MODERNIZE_TRANSFORMS_H
 #define CLANG_MODERNIZE_TRANSFORMS_H
 
-#include "llvm/Support/CommandLine.h"
 #include "llvm/ADT/StringRef.h"
-
+#include "llvm/Support/CommandLine.h"
 #include <vector>
 
 // Forward declarations

clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h

@@ -16,8 +16,8 @@
 #ifndef CLANG_MODERNIZE_LOOP_ACTIONS_H
 #define CLANG_MODERNIZE_LOOP_ACTIONS_H
 
-#include "StmtAncestor.h"
 #include "Core/Transform.h"
+#include "StmtAncestor.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"

clang-tools-extra/clang-modernize/PassByValue/PassByValue.h

@@ -16,8 +16,8 @@
 #ifndef CLANG_MODERNIZE_PASS_BY_VALUE_H
 #define CLANG_MODERNIZE_PASS_BY_VALUE_H
 
-#include "Core/Transform.h"
 #include "Core/IncludeDirectives.h"
+#include "Core/Transform.h"
 
 class ConstructorParamReplacer;
 

clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.cpp

@@ -14,9 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "PassByValueActions.h"
-#include "PassByValueMatchers.h"
 #include "Core/IncludeDirectives.h"
 #include "Core/Transform.h"
+#include "PassByValueMatchers.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Lex/Lexer.h"

clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp

@@ -14,9 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ReplaceAutoPtrActions.h"
-#include "ReplaceAutoPtrMatchers.h"
 #include "Core/Transform.h"
-
+#include "ReplaceAutoPtrMatchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Lex/Lexer.h"
 

clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp

@@ -16,10 +16,8 @@
 
 #include "NullptrActions.h"
 #include "NullptrMatchers.h"
-
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/RecursiveASTVisitor.h"
-
 #include "clang/Basic/CharInfo.h"
 #include "clang/Lex/Lexer.h"
 

clang-tools-extra/clang-query/Query.h

@@ -10,10 +10,10 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_H
 
-#include <string>
 #include "clang/ASTMatchers/Dynamic/VariantValue.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/Optional.h"
+#include <string>
 
 namespace clang {
 namespace query {

clang-tools-extra/clang-query/QueryParser.cpp

@@ -10,10 +10,10 @@
 #include "QueryParser.h"
 #include "Query.h"
 #include "QuerySession.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
 #include "clang/ASTMatchers/Dynamic/Parser.h"
 #include "clang/Basic/CharInfo.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/StringSwitch.h"
 
 using namespace llvm;
 using namespace clang::ast_matchers::dynamic;

clang-tools-extra/clang-query/QuerySession.h

@@ -10,8 +10,8 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_SESSION_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_SESSION_H
 
-#include "llvm/ADT/ArrayRef.h"
 #include "Query.h"
+#include "llvm/ADT/ArrayRef.h"
 
 namespace clang {
 

clang-tools-extra/clang-query/tool/ClangQuery.cpp

@@ -27,9 +27,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "Query.h"
-#include "QuerySession.h"
 #include "QueryParser.h"
-
+#include "QuerySession.h"
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Tooling/CompilationDatabase.h"
 #include "clang/Tooling/Tooling.h"
@@ -38,9 +37,8 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Signals.h"
 #include <fstream>
-#include <string>
-
 #include <histedit.h>
+#include <string>
 
 using namespace clang;
 using namespace clang::ast_matchers;

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -22,18 +22,18 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Lex/PPCallbacks.h"
-#include "clang/Lex/Preprocessor.h"
 #include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/MultiplexConsumer.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
+#include "clang/Lex/PPCallbacks.h"
+#include "clang/Lex/Preprocessor.h"
 #include "clang/Rewrite/Frontend/FixItRewriter.h"
 #include "clang/Rewrite/Frontend/FrontendActions.h"
 #include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/Tooling/Tooling.h"
 #include "clang/Tooling/Refactoring.h"
+#include "clang/Tooling/Tooling.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Signals.h"
 #include <algorithm>

clang-tools-extra/clang-tidy/ClangTidy.h

@@ -10,11 +10,11 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANG_TIDY_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANG_TIDY_H
 
+#include "ClangTidyDiagnosticConsumer.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Tooling/Refactoring.h"
-#include "ClangTidyDiagnosticConsumer.h"
 
 namespace clang {
 

clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp

@@ -12,11 +12,11 @@
 #include "../ClangTidyModule.h"
 #include "../ClangTidyModuleRegistry.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/PPCallbacks.h"
+#include "clang/Lex/Preprocessor.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang::ast_matchers;

clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp

@@ -12,11 +12,11 @@
 #include "../ClangTidyModule.h"
 #include "../ClangTidyModuleRegistry.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/PPCallbacks.h"
+#include "clang/Lex/Preprocessor.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang::ast_matchers;

clang-tools-extra/modularize/Modularize.cpp

@@ -143,6 +143,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/AST/ASTConsumer.h"
+#include "Modularize.h"
+#include "PreprocessorTracker.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/Basic/SourceManager.h"
@@ -167,8 +169,6 @@
 #include <iterator>
 #include <string>
 #include <vector>
-#include "Modularize.h"
-#include "PreprocessorTracker.h"
 
 using namespace clang;
 using namespace clang::driver;

clang-tools-extra/modularize/PreprocessorTracker.cpp

@@ -245,12 +245,12 @@
 //===--------------------------------------------------------------------===//
 
 #include "clang/Lex/LexDiagnostic.h"
+#include "PreprocessorTracker.h"
 #include "clang/Lex/MacroArgs.h"
 #include "clang/Lex/PPCallbacks.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/StringPool.h"
 #include "llvm/ADT/SmallSet.h"
-#include "PreprocessorTracker.h"
+#include "llvm/Support/StringPool.h"
+#include "llvm/Support/raw_ostream.h"
 
 namespace Modularize {
 

clang-tools-extra/module-map-checker/ModuleMapChecker.cpp

@@ -73,6 +73,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/AST/ASTConsumer.h"
+#include "ModuleMapChecker.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/Basic/SourceManager.h"
@@ -88,7 +89,6 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
-#include "ModuleMapChecker.h"
 
 using namespace clang;
 using namespace clang::driver;

clang-tools-extra/unittests/clang-apply-replacements/ReformattingTest.cpp

@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-apply-replacements/Tooling/ApplyReplacements.h"
+#include "common/VirtualFileHelper.h"
 #include "clang/Format/Format.h"
 #include "clang/Tooling/Refactoring.h"
-#include "common/VirtualFileHelper.h"
 #include "gtest/gtest.h"
 
 using namespace clang;

clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp

@@ -8,11 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "Core/IncludeDirectives.h"
-#include "gtest/gtest.h"
 #include "common/VirtualFileHelper.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendActions.h"
 #include "llvm/Support/Path.h"
+#include "gtest/gtest.h"
 
 using namespace llvm;
 using namespace clang;

clang-tools-extra/unittests/clang-modernize/IncludeExcludeTest.cpp

@@ -9,9 +9,9 @@
 
 #include "common/Utility.h"
 #include "Core/IncludeExcludeInfo.h"
-#include "gtest/gtest.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
+#include "gtest/gtest.h"
 #include <fstream>
 
 TEST(IncludeExcludeTest, ParseString) {

clang-tools-extra/unittests/clang-modernize/TransformTest.cpp

@@ -11,11 +11,11 @@
 #include "Core/Transform.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/DeclGroup.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Process.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/Process.h"
 
 using namespace clang;
 using namespace ast_matchers;

clang-tools-extra/unittests/clang-tidy/GoogleModuleTest.cpp

@@ -1,5 +1,4 @@
 #include "ClangTidyTest.h"
-
 #include "google/GoogleTidyModule.h"
 
 namespace clang {

clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp

@@ -1,5 +1,4 @@
 #include "ClangTidyTest.h"
-
 #include "llvm/LLVMTidyModule.h"
 
 namespace clang {