Run llvm/utils/sort_includes.py over the Clang tools code. This doesn't
authorChandler Carruth <chandlerc@gmail.com>
Tue, 7 Jan 2014 20:05:01 +0000 (20:05 +0000)
committerChandler Carruth <chandlerc@gmail.com>
Tue, 7 Jan 2014 20:05:01 +0000 (20:05 +0000)
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

30 files changed:
clang-tools-extra/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h
clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp
clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.cpp
clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
clang-tools-extra/clang-modernize/Core/PerfSupport.cpp
clang-tools-extra/clang-modernize/Core/PerfSupport.h
clang-tools-extra/clang-modernize/Core/ReplacementHandling.h
clang-tools-extra/clang-modernize/Core/Transforms.h
clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.cpp
clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp
clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
clang-tools-extra/clang-query/Query.h
clang-tools-extra/clang-query/QueryParser.cpp
clang-tools-extra/clang-query/QuerySession.h
clang-tools-extra/clang-query/tool/ClangQuery.cpp
clang-tools-extra/clang-tidy/ClangTidy.cpp
clang-tools-extra/clang-tidy/ClangTidy.h
clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp
clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp
clang-tools-extra/modularize/Modularize.cpp
clang-tools-extra/modularize/PreprocessorTracker.cpp
clang-tools-extra/module-map-checker/ModuleMapChecker.cpp
clang-tools-extra/unittests/clang-apply-replacements/ReformattingTest.cpp
clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp
clang-tools-extra/unittests/clang-modernize/IncludeExcludeTest.cpp
clang-tools-extra/unittests/clang-modernize/TransformTest.cpp
clang-tools-extra/unittests/clang-tidy/GoogleModuleTest.cpp
clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp

index 80165d4..f2e9a98 100644 (file)
@@ -16,7 +16,6 @@
 #include "AddOverride.h"
 #include "AddOverrideActions.h"
 #include "AddOverrideMatchers.h"
-
 #include "clang/Frontend/CompilerInstance.h"
 
 using clang::ast_matchers::MatchFinder;
index 134318e..eec6cf4 100644 (file)
 #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"
 
index d611caf..b2dcbb4 100644 (file)
@@ -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 {
index e074bd1..2554cfa 100644 (file)
@@ -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(),
index 19556e0..d16c0d6 100644 (file)
@@ -18,7 +18,6 @@
 
 #include "Transform.h"
 #include "llvm/ADT/StringRef.h"
-
 #include <map>
 #include <vector>
 
index dc718d8..54b9655 100644 (file)
@@ -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:
index 5b9b98c..545a16d 100644 (file)
@@ -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
index db37561..dfb05a7 100644 (file)
@@ -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"
index e604459..c47bfe1 100644 (file)
@@ -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;
 
index 36ddee5..872d69f 100644 (file)
@@ -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"
index 2074e37..0879264 100644 (file)
@@ -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"
 
index 1aca261..c37ef45 100644 (file)
 
 #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"
 
index 4c89417..eeeb1b9 100644 (file)
 #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 {
index 7a93e3b..9ef6c23 100644 (file)
 #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;
index 002b2b5..fdbd9ea 100644 (file)
@@ -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 {
 
index d8b411b..bac86b0 100644 (file)
@@ -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;
index bb7b456..e465c6c 100644 (file)
 #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>
index 677e6e9..16889bf 100644 (file)
 #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 {
 
index 0839a06..bf1e3e3 100644 (file)
 #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;
index cd33a51..ec1e779 100644 (file)
 #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;
index 13c0365..7619cb1 100644 (file)
 //===----------------------------------------------------------------------===//
 
 #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"
 #include <iterator>
 #include <string>
 #include <vector>
-#include "Modularize.h"
-#include "PreprocessorTracker.h"
 
 using namespace clang;
 using namespace clang::driver;
index 9562a1c..22989ee 100644 (file)
 //===--------------------------------------------------------------------===//
 
 #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 {
 
index 36217d5..2ac7525 100644 (file)
@@ -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;
index e163082..6d638b5 100644 (file)
@@ -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;
index b6ad4af..d81ae1d 100644 (file)
@@ -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;
index dd41cdf..232a47a 100644 (file)
@@ -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) {
index 5e5093a..fe86f94 100644 (file)
 #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;