diff --git a/clang-tools-extra/clang-rename/RenamingAction.h b/clang-tools-extra/clang-rename/RenamingAction.h
index dd46aefa5d3f..839952e8e191 100644
--- a/clang-tools-extra/clang-rename/RenamingAction.h
+++ b/clang-tools-extra/clang-rename/RenamingAction.h
@@ -41,7 +41,6 @@ private:
   std::map<std::string, tooling::Replacements> &FileToReplaces;
   bool PrintLocations;
 };
-
 }
 }
 
diff --git a/clang-tools-extra/clang-rename/USRFinder.h b/clang-tools-extra/clang-rename/USRFinder.h
index 727a81514fb7..3ff639df83e6 100644
--- a/clang-tools-extra/clang-rename/USRFinder.h
+++ b/clang-tools-extra/clang-rename/USRFinder.h
@@ -49,7 +49,7 @@ std::string getUSRForDecl(const Decl *Decl);
 class NestedNameSpecifierLocFinder : public MatchFinder::MatchCallback {
 public:
   explicit NestedNameSpecifierLocFinder(ASTContext &Context)
-    : Context(Context) {}
+      : Context(Context) {}
 
   std::vector<NestedNameSpecifierLoc> getNestedNameSpecifierLocations() {
     addMatchers();
@@ -65,8 +65,8 @@ private:
   }
 
   virtual void run(const MatchFinder::MatchResult &Result) {
-    const auto *NNS =
-        Result.Nodes.getNodeAs<NestedNameSpecifierLoc>("nestedNameSpecifierLoc");
+    const auto *NNS = Result.Nodes.getNodeAs<NestedNameSpecifierLoc>(
+        "nestedNameSpecifierLoc");
     Locations.push_back(*NNS);
   }
 
@@ -74,7 +74,6 @@ private:
   std::vector<NestedNameSpecifierLoc> Locations;
   MatchFinder Finder;
 };
-
 }
 }
 
diff --git a/clang-tools-extra/clang-rename/USRFindingAction.cpp b/clang-tools-extra/clang-rename/USRFindingAction.cpp
index 9ceb1aaddde3..41f6b8444c6d 100644
--- a/clang-tools-extra/clang-rename/USRFindingAction.cpp
+++ b/clang-tools-extra/clang-rename/USRFindingAction.cpp
@@ -33,7 +33,6 @@
 #include <set>
 #include <vector>
 
-
 using namespace llvm;
 
 namespace clang {
@@ -47,8 +46,8 @@ namespace {
 class AdditionalUSRFinder : public RecursiveASTVisitor<AdditionalUSRFinder> {
 public:
   explicit AdditionalUSRFinder(const Decl *FoundDecl, ASTContext &Context,
-                             std::vector<std::string> *USRs)
-    : FoundDecl(FoundDecl), Context(Context), USRs(USRs) {}
+                               std::vector<std::string> *USRs)
+      : FoundDecl(FoundDecl), Context(Context), USRs(USRs) {}
 
   void Find() {
     // Fill OverriddenMethods and PartialSpecs storages.
@@ -63,7 +62,7 @@ public:
     } else if (const auto *RecordDecl = dyn_cast<CXXRecordDecl>(FoundDecl)) {
       handleCXXRecordDecl(RecordDecl);
     } else if (const auto *TemplateDecl =
-               dyn_cast<ClassTemplateDecl>(FoundDecl)) {
+                   dyn_cast<ClassTemplateDecl>(FoundDecl)) {
       handleClassTemplateDecl(TemplateDecl);
     } else {
       USRSet.insert(getUSRForDecl(FoundDecl));
@@ -87,8 +86,8 @@ public:
 private:
   void handleCXXRecordDecl(const CXXRecordDecl *RecordDecl) {
     RecordDecl = RecordDecl->getDefinition();
-    if (const auto *ClassTemplateSpecDecl
-            = dyn_cast<ClassTemplateSpecializationDecl>(RecordDecl)) {
+    if (const auto *ClassTemplateSpecDecl =
+            dyn_cast<ClassTemplateSpecializationDecl>(RecordDecl)) {
       handleClassTemplateDecl(ClassTemplateSpecDecl->getSpecializedTemplate());
     }
     addUSRsOfCtorDtors(RecordDecl);
@@ -137,8 +136,8 @@ private:
   ASTContext &Context;
   std::vector<std::string> *USRs;
   std::set<std::string> USRSet;
-  std::vector<const CXXMethodDecl*> OverriddenMethods;
-  std::vector<const ClassTemplatePartialSpecializationDecl*> PartialSpecs;
+  std::vector<const CXXMethodDecl *> OverriddenMethods;
+  std::vector<const ClassTemplatePartialSpecializationDecl *> PartialSpecs;
 };
 } // namespace