From 958c46bb9a61b1c63e15263f7c217d1715acc9a6 Mon Sep 17 00:00:00 2001
From: Max Piskunov <maxitg@icloud.com>
Date: Tue, 6 Oct 2020 21:17:25 -0500
Subject: [PATCH] Make .clang-format consistent with cpplint (#435)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Changes
* Apparently, there were some changes to `cpplint`, and it now expects gtest headers to go above C++ std headers.
* This PR reorders the headers and removes custom ordering from .clang-format.

## Examples
* `./lint.sh` no longer produces any error messages.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/maxitg/setreplace/435)
<!-- Reviewable:end -->
---
 .clang-format                   | 13 -------------
 libSetReplace/test/Set_test.cpp |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.clang-format b/.clang-format
index 6e859bf8d..8d1059d01 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,18 +6,5 @@ BinPackArguments: false
 BinPackParameters: false
 ColumnLimit: 120
 DerivePointerAlignment: false
-IncludeCategories:
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-    SortPriority:    0
-  - Regex:           '^<.*\.h>'
-    Priority:        2
-    SortPriority:    0
-  - Regex:           '^<.*'
-    Priority:        1
-    SortPriority:    0
-  - Regex:           '.*'
-    Priority:        3
-    SortPriority:    0
 Standard: c++17
 ...
diff --git a/libSetReplace/test/Set_test.cpp b/libSetReplace/test/Set_test.cpp
index d166c77c2..698e7e2ff 100644
--- a/libSetReplace/test/Set_test.cpp
+++ b/libSetReplace/test/Set_test.cpp
@@ -1,9 +1,9 @@
 #include "Set.hpp"
 
-#include <vector>
-
 #include <gtest/gtest.h>
 
+#include <vector>
+
 #include "Match.hpp"
 #include "Rule.hpp"