浏览代码

clang-format: fix erroneous handling of header <queue>

The rule Regex: '^<' was not applied to this header because a more specific one applies: Regex: '^(<|")Qt?[A-Z]' used for Qt headers (rules are not case-sensitive). So adding a specific rule for this header before the Qt rule is required.
Marc Chevrier 5 年之前
父节点
当前提交
a8aa89352a
共有 4 个文件被更改,包括 5 次插入6 次删除
  1. 2 0
      .clang-format
  2. 1 2
      Source/cmComputeLinkDepends.h
  3. 1 2
      Source/cmDependsC.h
  4. 1 2
      Source/cmGeneratorTarget.cxx

+ 2 - 0
.clang-format

@@ -22,6 +22,8 @@ IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^[<"]cmConfigure\.h'
     Priority:        -1
+  - Regex:           '^<queue>'
+    Priority:        1
   - Regex:           '^(<|")cm(ext)?/'
     Priority:        2
   - Regex:           '^(<|")windows\.h'

+ 1 - 2
Source/cmComputeLinkDepends.h

@@ -7,12 +7,11 @@
 
 #include <map>
 #include <memory>
+#include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <queue>
-
 #include "cmGraphAdjacencyList.h"
 #include "cmLinkItem.h"
 #include "cmTargetLinkLibraryType.h"

+ 1 - 2
Source/cmDependsC.h

@@ -7,12 +7,11 @@
 
 #include <iosfwd>
 #include <map>
+#include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <queue>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmDepends.h"

+ 1 - 2
Source/cmGeneratorTarget.cxx

@@ -10,6 +10,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <iterator>
+#include <queue>
 #include <sstream>
 #include <unordered_set>
 #include <utility>
@@ -17,8 +18,6 @@
 #include <cm/memory>
 #include <cm/string_view>
 
-#include <queue>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmAlgorithms.h"