From f0cede3ba333cf4502029cc0a85bf6edd399ea53 Mon Sep 17 00:00:00 2001
From: Conor Hoekstra <36027403+codereport@users.noreply.github.com>
Date: Tue, 14 Dec 2021 18:13:55 -0500
Subject: [PATCH] Remove `IncludeCategories` from `.clang-format` (#470)

It was recently noticed that the `IncludeCategories`:
```
IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
    Priority:        2
  - Regex:           '^<.*\.h>'
    Priority:        1
  - Regex:           '^<.*'
    Priority:        2
  - Regex:           '.*'
    Priority:        3
```
In the `.clang-format` are not really necessary as `ext` has no meaning in RAPIDS. This PR removes these.

Note these changes are being made in all repos:
* `cudf`: https://github.com/rapidsai/cudf/pull/9876
* `rmm`: https://github.com/rapidsai/rmm/pull/933
* `cuml`: https://github.com/rapidsai/cuml/pull/4438
* `cugraph`: https://github.com/rapidsai/cugraph/pull/1987

Authors:
  - Conor Hoekstra (https://github.com/codereport)

Approvers:
  - Mark Harris (https://github.com/harrism)

URL: https://github.com/rapidsai/cuspatial/pull/470
---
 cpp/.clang-format                           | 9 ---------
 cpp/src/io/shp/polygon_shapefile_reader.cpp | 3 ++-
 cpp/tests/interpolate/cubic_spline_test.cpp | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/cpp/.clang-format b/cpp/.clang-format
index 0c05436e9..6019a6f3d 100644
--- a/cpp/.clang-format
+++ b/cpp/.clang-format
@@ -72,15 +72,6 @@ ForEachMacros:
   - Q_FOREACH
   - BOOST_FOREACH
 IncludeBlocks: Preserve
-IncludeCategories:
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
 IndentPPDirectives: None
diff --git a/cpp/src/io/shp/polygon_shapefile_reader.cpp b/cpp/src/io/shp/polygon_shapefile_reader.cpp
index 573f266a4..0088f080e 100644
--- a/cpp/src/io/shp/polygon_shapefile_reader.cpp
+++ b/cpp/src/io/shp/polygon_shapefile_reader.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include <ogrsf_frmts.h>
 #include <cuspatial/error.hpp>
 
+#include <ogrsf_frmts.h>
+
 #include <cudf/types.hpp>
 
 #include <memory>
diff --git a/cpp/tests/interpolate/cubic_spline_test.cpp b/cpp/tests/interpolate/cubic_spline_test.cpp
index bc86e0319..2a6406a61 100644
--- a/cpp/tests/interpolate/cubic_spline_test.cpp
+++ b/cpp/tests/interpolate/cubic_spline_test.cpp
@@ -28,9 +28,9 @@
 #include <cuspatial/detail/cubic_spline.hpp>
 #include <cuspatial/error.hpp>
 
+#include <string>
 #include <sys/time.h>
 #include <time.h>
-#include <string>
 
 struct CubicSplineTest : public cudf::test::BaseFixture {
 };