4 files changed, 22 insertions, 20 deletions
diff --git a/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h b/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h
index f87ea655295..ab02b2504b8 100644
--- a/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h
+++ b/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h
@@ -1,11 +1,11 @@
 // Set up so TypeInt only defined during InconsistentHeader1.h include.
 #ifdef SYMBOL1
 #define SYMBOL 1
-#define FUNC_STYLE(a, b) a||b
+#define FUNC_STYLE(a, b) a || b
 #endif
 #ifdef SYMBOL2
 #define SYMBOL 2
-#define FUNC_STYLE(a, b) a&&b
+#define FUNC_STYLE(a, b) a &&b
 #endif
 
 #if SYMBOL == 1
diff --git a/clang-tools-extra/test/modularize/Inputs/NamespaceClasses.h b/clang-tools-extra/test/modularize/Inputs/NamespaceClasses.h
index 57e6091fd96..94167c4bab0 100644
--- a/clang-tools-extra/test/modularize/Inputs/NamespaceClasses.h
+++ b/clang-tools-extra/test/modularize/Inputs/NamespaceClasses.h
@@ -1,20 +1,21 @@
 // Define same class name in different namespaces.
 
 namespace Namespace1 {
-  class NamespaceClass {
-  public:
-    NamespaceClass() : Member(0) {}
-  private:
-    int Member;
-  };
+class NamespaceClass {
+public:
+  NamespaceClass() : Member(0) {}
+
+private:
+  int Member;
+};
 }
 
 namespace Namespace2 {
-  class NamespaceClass {
-  public:
-    NamespaceClass() : Member(0) {}
-  private:
-    int Member;
-  };
-}
+class NamespaceClass {
+public:
+  NamespaceClass() : Member(0) {}
 
+private:
+  int Member;
+};
+}
diff --git a/clang-tools-extra/test/modularize/Inputs/SomeDecls.h b/clang-tools-extra/test/modularize/Inputs/SomeDecls.h
index 8892b650c18..c3ec2fdcfe8 100644
--- a/clang-tools-extra/test/modularize/Inputs/SomeDecls.h
+++ b/clang-tools-extra/test/modularize/Inputs/SomeDecls.h
@@ -8,9 +8,9 @@ void FuncOverload(int arg) {}
 void FuncOverload(char *arg) {}
 
 namespace Namespace1 {
-  void FuncNameSpace() {}
+void FuncNameSpace() {}
 }
 
 namespace Namespace2 {
-  void FuncNameSpace() {}
+void FuncNameSpace() {}
 }
diff --git a/clang-tools-extra/test/modularize/Inputs/TemplateClasses.h b/clang-tools-extra/test/modularize/Inputs/TemplateClasses.h
index 3eab6d90091..e0b9402f641 100644
--- a/clang-tools-extra/test/modularize/Inputs/TemplateClasses.h
+++ b/clang-tools-extra/test/modularize/Inputs/TemplateClasses.h
@@ -1,15 +1,16 @@
 // Exercise some template issues.  Should not produce errors.
 
 // Forward declaration.
-template<class T> class TemplateClass;
+template <class T> class TemplateClass;
 
 // Full declaration.
-template<class T>class TemplateClass {
+template <class T> class TemplateClass {
 public:
   TemplateClass() {}
+
 private:
   T Member;
 };
 
 // Template alias.
-template<class T> using TemplateClassAlias = TemplateClass<T>;
+template <class T> using TemplateClassAlias = TemplateClass<T>;