Use a new header sorting order

Signed-off-by: Gavin Howard <gavin@yzena.com>

.clang-format

@@ -74,9 +74,13 @@ ForEachMacros:
 IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^<(sys|arpa|net|netinet)/.*\.h>'
-    Priority:        4
+    Priority:        7
   - Regex:           '^<yc/.*\.h>'
     Priority:        -1
+  - Regex:           '^".*/.*/.*/.*/.*\.h"'
+    Priority:        4
+  - Regex:           '^".*/.*/.*/.*\.h"'
+    Priority:        3
   - Regex:           '^".*/.*/.*\.h"'
     Priority:        2
   - Regex:           '^".*/.*\.h"'
@@ -84,11 +88,11 @@ IncludeCategories:
   - Regex:           '^".*\.h"'
     Priority:        0
   - Regex:           '^<.*/.*\.h>'
-    Priority:        3
+    Priority:        7
   - Regex:           '^<.*\.h>'
-    Priority:        5
-  - Regex:           '^<.*>'
     Priority:        6
+  - Regex:           '^<.*>'
+    Priority:        8
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: true

include/yc/arith.h

@@ -69,13 +69,13 @@ extern "C"
 #endif
 
 //! @cond Doxygen suppress.
-#include <sys/stat.h>
-
 #include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
+
+#include <sys/stat.h>
 //! @endcond
 
 #include <yc/assert.h>

include/yc/io.h

@@ -74,13 +74,13 @@ extern "C"
 #include <yc/string.h>
 #include <yc/yc.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 /**
  * @file yc/io.h
  */

include/yc/ntree.h

@@ -69,9 +69,9 @@ extern "C"
 #endif
 
 //! @cond Doxygen suppress.
-#include <sys/types.h>
-
 #include <stdbool.h>
+
+#include <sys/types.h>
 //! @endcond
 
 #include <yc/tree.h>

include/yc/tree.h

@@ -69,9 +69,9 @@ extern "C"
 #endif
 
 //! @cond Doxygen suppress.
-#include <sys/types.h>
-
 #include <stdbool.h>
+
+#include <sys/types.h>
 //! @endcond
 
 #include <yc/vector.h>

src/alloc/os/posix/alloc.c

@@ -60,9 +60,10 @@
  */
 #include <yc/strucon.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../stackpool.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <sys/mman.h>
 
 void*

src/concurrency/os/posix/condvar.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../io/io.h"
 #include "../../strucon.h"
 
+#include "../../../io/io.h"
+
 #include <errno.h>
 #include <pthread.h>
 #include <time.h>

src/concurrency/os/posix/rwlock.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../yc.h"
 #include "../../strucon.h"
 
+#include "../../../yc.h"
+
 #include <errno.h>
 
 y_Status

src/concurrency/os/posix/semaphore.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../yc.h"
 #include "../../strucon.h"
 
+#include "../../../yc.h"
+
 #include <errno.h>
 #include <time.h>
 

src/concurrency/os/posix/semaphore_darwin.c

@@ -62,13 +62,14 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../yc.h"
 #include "../../strucon.h"
 
-#include <dispatch/dispatch.h>
+#include "../../../yc.h"
 
 #include <errno.h>
 
+#include <dispatch/dispatch.h>
+
 // Warning: Mac OSX semaphores might be unsafe in signal handlers. See
 // https://github.com/adrienverge/openfortivpn/issues/105.
 

src/concurrency/os/windows/condvar.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../io/bareio.h"
 #include "../../strucon.h"
 
+#include "../../../io/bareio.h"
+
 #include <pthread.h>
 #include <time.h>
 

src/concurrency/os/windows/rwlock.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../yc.h"
 #include "../../strucon.h"
 
+#include "../../../yc.h"
+
 y_Status
 y_strucon_rwlock_init_os(y_strucon_rwlock* l)
 {

src/concurrency/os/windows/semaphore.c

@@ -62,9 +62,10 @@
 #include <yc/strucon.h>
 #include <yc/yc.h>
 
-#include "../../../yc.h"
 #include "../../strucon.h"
 
+#include "../../../yc.h"
+
 #include <errno.h>
 
 y_Status

src/io/os/posix/bareio.c

@@ -64,9 +64,10 @@
 
 #include "../../bareio.h"
 
-#include "../../../concurrency/strucon.h"
 #include "../../io.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <errno.h>
 
 y_Status

src/io/os/posix/fs.c

@@ -96,12 +96,11 @@
 
 #include "posix.h"
 
-#include "../../../str/string.h"
-#include "../../../yc.h"
 #include "../../io.h"
 
-#include <sys/stat.h>
-#include <sys/types.h>
+#include "../../../yc.h"
+
+#include "../../../str/string.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -109,6 +108,9 @@
 #include <pwd.h>
 #include <stdlib.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 // XXX: I'm declaring this here because it is in the stdio.h header, which I do
 // *not* want to include because it's heavyweight, and I'm not using it
 // otherwise. It also probably has some startup code that I want to avoid. So

src/io/os/posix/posix.h

@@ -124,11 +124,11 @@ extern "C"
 
 #define y_FS_ENTRY_ISOPEN(dir) ((dir)->d != NULL)
 
+#include <fcntl.h>
+
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <fcntl.h>
-
 #ifndef P_tmpdir
 
 #include <paths.h>

src/io/os/windows/dir.c

@@ -96,9 +96,10 @@
 
 #include "windows.h"
 
-#include "../../../concurrency/strucon.h"
 #include "../../fs.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <ntdef.h>
 #include <windows.h>
 #include <winternl.h>

src/io/os/windows/fs.c

@@ -94,10 +94,12 @@
 #include <yc/error.h>
 #include <yc/io.h>
 
-#include "../../../concurrency/strucon.h"
-#include "../../../yc.h"
 #include "../../io.h"
 
+#include "../../../yc.h"
+
+#include "../../../concurrency/strucon.h"
+
 #include <errno.h>
 
 y_Error

src/io/os/windows/windows.h

@@ -104,13 +104,13 @@ extern "C"
 
 #include <yc/fs.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <initguid.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #if YC_CLANG
 #pragma clang diagnostic ignored "-Wpadded"
 #endif // YC_CLANG

src/io/path.c

@@ -101,11 +101,11 @@
 
 #include "../alloc/stackpool.h"
 
-#include <sys/stat.h>
-
 #include <errno.h>
 #include <stdlib.h>
 
+#include <sys/stat.h>
+
 ////////////////////////////////////////////////////////////////////////////////
 // Public functions.
 ////////////////////////////////////////////////////////////////////////////////

src/sys/os/posix/multiplex.c

@@ -63,10 +63,12 @@
 
 #include "../../multiplex.h"
 
-#include "../../../sys/sys.h"
-#include "../../../yc.h"
 #include "../../proc.h"
 
+#include "../../../yc.h"
+
+#include "../../../sys/sys.h"
+
 #include <errno.h>
 #include <time.h>
 

src/sys/os/posix/proc.c

@@ -66,15 +66,13 @@
 
 #include "../../proc.h"
 
-#include "../../../concurrency/strucon.h"
-#include "../../../io/bareio.h"
-#include "../../../yc.h"
 #include "../../multiplex.h"
 #include "../../sys.h"
 
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+#include "../../../yc.h"
+
+#include "../../../concurrency/strucon.h"
+#include "../../../io/bareio.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -84,6 +82,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/select.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
 // This is declared because POSIX requires it to be. Well, there is something
 // wrong with the POSIX headers, anyway.
 extern char** environ;

src/sys/os/posix/sys.c

@@ -68,17 +68,16 @@
 
 #include "sys.h"
 
+#include "../../multiplex.h"
+#include "../../proc.h"
+
+#include "../../../yc.h"
+
 #include "../../../concurrency/strucon.h"
 #include "../../../container/map.h"
 #include "../../../container/vec.h"
 #include "../../../io/bareio.h"
 #include "../../../time/time.h"
-#include "../../../yc.h"
-#include "../../multiplex.h"
-#include "../../proc.h"
-
-#include <sys/utsname.h>
-#include <sys/wait.h>
 
 #include <errno.h>
 #include <limits.h>
@@ -86,6 +85,9 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include <sys/utsname.h>
+#include <sys/wait.h>
+
 #ifdef __linux__
 #include <sys/random.h>
 #endif // __linux__

src/sys/os/windows/multiplex.c

@@ -76,7 +76,7 @@ y_multiplex_os_fd(const y_Multiplex m, y_usize i)
 	fd = y_nvec_at(m, y_MULTIPLEX_FD_IDX, i);
 	ret = *fd;
 
-	          y_return_dbg(ret);
+	y_return_dbg(ret);
 }
 
 y_MultiplexFd

src/sys/os/windows/proc.c

@@ -65,13 +65,13 @@
 
 #include "../../../concurrency/strucon.h"
 
-#include <sys/types.h>
-#include <sys/wait.h>
-
 #include <errno.h>
 #include <signal.h>
 #include <stdbool.h>
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #define READ_FD  (0)
 #define WRITE_FD (1)
 

src/sys/os/windows/sys.c

@@ -64,9 +64,10 @@
 
 #include "../../sys.h"
 
-#include "../../../concurrency/strucon.h"
 #include "../../../yc.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <ntdef.h>
 #include <windows.h>
 #include <winternl.h>

src/time/os/darwin/clock.c

@@ -63,9 +63,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <errno.h>
 
 y_Clock

src/time/os/darwin/date.c

@@ -61,9 +61,10 @@
 
 #include <yc/time.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 y_Status
 y_time_date_os_now(y_Date* d)
 {

src/time/os/darwin/time.c

@@ -67,10 +67,10 @@
 
 #include "../../../concurrency/strucon.h"
 
-#include <mach/mach_time.h>
-
 #include <inttypes.h>
 
+#include <mach/mach_time.h>
+
 y_Time
 y_time_time_os_add(y_Time time1, y_Time time2)
 {

src/time/os/darwin/timer.c

@@ -64,9 +64,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
+#include "../../time.h"
+
 #include "../../../io/bareio.h"
 #include "../../../io/io.h"
-#include "../../time.h"
 
 #include <errno.h>
 

src/time/os/posix/clock.c

@@ -63,9 +63,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <errno.h>
 #include <time.h>
 

src/time/os/posix/date.c

@@ -61,9 +61,10 @@
 
 #include <yc/time.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 #include <time.h>
 
 y_Status

src/time/os/posix/timer.c

@@ -64,9 +64,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
-#include "../../../io/io.h"
 #include "../../time.h"
 
+#include "../../../io/io.h"
+
 #include <errno.h>
 #include <signal.h>
 #include <time.h>

src/time/os/windows/clock.c

@@ -62,9 +62,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 // TODO: Take this away and only use for date times.
 static const LARGE_INTEGER y_time_adjustment = {
 	.QuadPart = 11644473600000 * 10000

src/time/os/windows/timer.c

@@ -62,9 +62,10 @@
 #include <yc/time.h>
 #include <yc/yc.h>
 
-#include "../../../concurrency/strucon.h"
 #include "../../time.h"
 
+#include "../../../concurrency/strucon.h"
+
 // TODO: Take this away and only use for date times.
 static const LARGE_INTEGER y_time_adjustment = {
 	.QuadPart = 11644473600000 * 10000