Skip to content

Commit

Permalink
Make .clang-format consistent with cpplint (#435)
Browse files Browse the repository at this point in the history
## 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 -->
  • Loading branch information
maxitg authored Oct 7, 2020
1 parent d2aa645 commit 958c46b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
13 changes: 0 additions & 13 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -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
...
4 changes: 2 additions & 2 deletions libSetReplace/test/Set_test.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "Set.hpp"

#include <vector>

#include <gtest/gtest.h>

#include <vector>

#include "Match.hpp"
#include "Rule.hpp"

Expand Down

0 comments on commit 958c46b

Please sign in to comment.