4 files changed, 13 insertions, 25 deletions
diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 74eb6ea44a8..ed27c2119c6 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -65,7 +65,7 @@ struct CollectBoundNodes : MatchFinder::MatchCallback {
   }
 };
 
-}  // namespace
+} // namespace
 
 bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
   unsigned MatchCount = 0;
@@ -100,11 +100,10 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
           if (R.isValid()) {
             TextDiagnostic TD(OS, AST->getASTContext().getLangOpts(),
                               &AST->getDiagnostics().getDiagnosticOptions());
-            TD.emitDiagnostic(
-                R.getBegin(), DiagnosticsEngine::Note,
-                "\"" + BI->first + "\" binds here",
-                CharSourceRange::getTokenRange(R),
-                None, &AST->getSourceManager());
+            TD.emitDiagnostic(R.getBegin(), DiagnosticsEngine::Note,
+                              "\"" + BI->first + "\" binds here",
+                              CharSourceRange::getTokenRange(R), None,
+                              &AST->getSourceManager());
           }
           break;
         }
diff --git a/clang-tools-extra/clang-query/Query.h b/clang-tools-extra/clang-query/Query.h
index 109336a9ddc..b8c59cb3518 100644
--- a/clang-tools-extra/clang-query/Query.h
+++ b/clang-tools-extra/clang-query/Query.h
@@ -18,11 +18,7 @@
 namespace clang {
 namespace query {
 
-enum OutputKind {
-  OK_Diag,
-  OK_Print,
-  OK_Dump
-};
+enum OutputKind { OK_Diag, OK_Print, OK_Dump };
 
 enum QueryKind {
   QK_Invalid,
diff --git a/clang-tools-extra/clang-query/QueryParser.cpp b/clang-tools-extra/clang-query/QueryParser.cpp
index e25b69700b0..15d6bbc1e7d 100644
--- a/clang-tools-extra/clang-query/QueryParser.cpp
+++ b/clang-tools-extra/clang-query/QueryParser.cpp
@@ -76,9 +76,7 @@ template <typename T> struct QueryParser::LexOrCompleteWord {
     return *this;
   }
 
-  T Default(const T& Value) const {
-    return Switch.Default(Value);
-  }
+  T Default(const T &Value) const { return Switch.Default(Value); }
 };
 
 // Lexes a word and stores it in Word. Returns a LexOrCompleteWord<T> object
@@ -101,9 +99,9 @@ QueryParser::lexOrCompleteWord(StringRef &Word) {
 QueryRef QueryParser::parseSetBool(bool QuerySession::*Var) {
   StringRef ValStr;
   unsigned Value = lexOrCompleteWord<unsigned>(ValStr)
-                      .Case("false", 0)
-                      .Case("true", 1)
-                      .Default(~0u);
+                       .Case("false", 0)
+                       .Case("true", 1)
+                       .Default(~0u);
   if (Value == ~0u) {
     return new InvalidQuery("expected 'true' or 'false', got '" + ValStr + "'");
   }
@@ -145,11 +143,7 @@ enum ParsedQueryKind {
   PQK_Quit
 };
 
-enum ParsedQueryVariable {
-  PQV_Invalid,
-  PQV_Output,
-  PQV_BindRoot
-};
+enum ParsedQueryVariable { PQV_Invalid, PQV_Output, PQV_BindRoot };
 
 QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) {
   std::string ErrStr;
@@ -158,7 +152,7 @@ QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) {
   return new InvalidQuery(OS.str());
 }
 
-}  // namespace
+} // namespace
 
 QueryRef QueryParser::completeMatcherExpression() {
   std::vector<MatcherCompletion> Comps = Parser::completeExpression(
diff --git a/clang-tools-extra/clang-query/QueryParser.h b/clang-tools-extra/clang-query/QueryParser.h
index a43f84da336..20591815b9f 100644
--- a/clang-tools-extra/clang-query/QueryParser.h
+++ b/clang-tools-extra/clang-query/QueryParser.h
@@ -37,8 +37,7 @@ public:
 
 private:
   QueryParser(StringRef Line, const QuerySession &QS)
-      : Begin(Line.begin()), End(Line.end()),
-        CompletionPos(nullptr), QS(QS) {}
+      : Begin(Line.begin()), End(Line.end()), CompletionPos(nullptr), QS(QS) {}
 
   StringRef lexWord();