Reformat

Put nowide headers at top, to test for self-containment
Then custom headers (i.e. "" style includes)
then boost headers (semi-standard)
then standard headers (all other <> style includes)

.clang-format

@@ -73,15 +73,15 @@ IncludeCategories:
   - Regex:           '<boost/nowide'
     Priority:        49
     SortPriority:    0
-  - Regex:           '<boost/'
+  - Regex:           '^"'
     Priority:        50
     SortPriority:    0
+  - Regex:           '<boost/'
+    Priority:        75
+    SortPriority:    0
   - Regex:           '^<'
     Priority:        100
     SortPriority:    0
-  - Regex:           '^"'
-    Priority:        200
-    SortPriority:    0
   - Regex:           '.*'
     Priority:        1
     SortPriority:    0

test/file_test_helpers.hpp

@@ -8,11 +8,11 @@
 #define BOOST_NOWIDE_FILE_TEST_HELPERS_HPP_INCLUDED
 
 #include <boost/nowide/cstdio.hpp>
+#include "test.hpp"
 #include <limits>
 #include <numeric>
 #include <random>
 #include <string>
-#include "test.hpp"
 
 namespace boost {
 namespace nowide {

test/test_codecvt.cpp

@@ -9,15 +9,14 @@
 #include <boost/nowide/utf8_codecvt.hpp>
 
 #include <boost/nowide/convert.hpp>
+#include "test.hpp"
+#include "test_sets.hpp"
 #include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <locale>
 #include <vector>
 
-#include "test.hpp"
-#include "test_sets.hpp"
-
 static const char* utf8_name =
   "\xf0\x9d\x92\x9e-\xD0\xBF\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82-\xE3\x82\x84\xE3\x81\x82.txt";
 static const std::wstring wide_name_str = boost::nowide::widen(utf8_name);

test/test_convert.cpp

@@ -7,13 +7,12 @@
 //
 
 #include <boost/nowide/convert.hpp>
+#include "test.hpp"
+#include "test_sets.hpp"
 #include <array>
 #include <iostream>
 #include <string>
 
-#include "test.hpp"
-#include "test_sets.hpp"
-
 #ifdef __cpp_lib_string_view
 #include <string_view>
 #define BOOST_NOWIDE_TEST_STD_STRINGVIEW

test/test_env.cpp

@@ -7,14 +7,13 @@
 //
 
 #include <boost/nowide/cstdlib.hpp>
+#include "test.hpp"
 #include <cstring>
 
 #if defined(BOOST_NOWIDE_TEST_INCLUDE_WINDOWS) && defined(BOOST_WINDOWS)
 #include <windows.h>
 #endif
 
-#include "test.hpp"
-
 // "Safe" strcpy version with NULL termination to make MSVC runtime happy
 // which warns when using strncpy
 template<size_t size>

test/test_filebuf.cpp

@@ -7,12 +7,12 @@
 
 #include <boost/nowide/filebuf.hpp>
 
+#include "file_test_helpers.hpp"
+#include "test.hpp"
 #include <cstdint>
 #include <random>
 #include <string>
 #include <type_traits>
-#include "file_test_helpers.hpp"
-#include "test.hpp"
 
 namespace nw = boost::nowide;
 using namespace boost::nowide::test;

test/test_fs.cpp

@@ -11,9 +11,8 @@
 #include <boost/nowide/convert.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
-
 #include "test.hpp"
+#include <boost/filesystem/operations.hpp>
 
 void test_main(int, char** argv, char**)
 {

test/test_fstream.cpp

@@ -9,13 +9,12 @@
 
 #include <boost/nowide/convert.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include "file_test_helpers.hpp"
+#include "test.hpp"
 #include <fstream>
 #include <iostream>
 #include <string>
 
-#include "file_test_helpers.hpp"
-#include "test.hpp"
-
 namespace nw = boost::nowide;
 using namespace boost::nowide::test;
 

test/test_fstream_cxx11.cpp

@@ -9,11 +9,10 @@
 #include <boost/nowide/fstream.hpp>
 
 #include <boost/nowide/cstdio.hpp>
-#include <iterator>
-#include <utility>
-
 #include "file_test_helpers.hpp"
 #include "test.hpp"
+#include <iterator>
+#include <utility>
 
 namespace nw = boost::nowide;
 using namespace boost::nowide::test;

test/test_fstream_special.cpp

@@ -9,13 +9,12 @@
 
 #include <boost/nowide/convert.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include "file_test_helpers.hpp"
+#include "test.hpp"
 #include <fstream>
 #include <iostream>
 #include <string>
 
-#include "file_test_helpers.hpp"
-#include "test.hpp"
-
 namespace nw = boost::nowide;
 
 using namespace boost::nowide::test;

test/test_ifstream.cpp

@@ -7,10 +7,9 @@
 
 #include <boost/nowide/fstream.hpp>
 
-#include <string>
-
 #include "file_test_helpers.hpp"
 #include "test.hpp"
+#include <string>
 
 namespace nw = boost::nowide;
 using namespace boost::nowide::test;

test/test_iostream.cpp

@@ -9,11 +9,10 @@
 #include <boost/nowide/iostream.hpp>
 
 #include <boost/nowide/utf/utf.hpp>
+#include "test.hpp"
 #include <limits>
 #include <string>
 
-#include "test.hpp"
-
 bool isValidUTF8(const std::string& s)
 {
     using namespace boost::nowide::utf;

test/test_ofstream.cpp

@@ -7,10 +7,9 @@
 
 #include <boost/nowide/fstream.hpp>
 
-#include <string>
-
 #include "file_test_helpers.hpp"
 #include "test.hpp"
+#include <string>
 
 namespace nw = boost::nowide;
 using namespace boost::nowide::test;

test/test_stackstring.cpp

@@ -8,11 +8,10 @@
 //
 
 #include <boost/nowide/stackstring.hpp>
-#include <iostream>
-#include <vector>
-
 #include "test.hpp"
 #include "test_sets.hpp"
+#include <iostream>
+#include <vector>
 
 #if defined(BOOST_MSVC) && BOOST_MSVC < 1700
 #pragma warning(disable : 4428) // universal-character-name encountered in source

test/test_stat.cpp

@@ -8,12 +8,11 @@
 #include <boost/nowide/stat.hpp>
 
 #include <boost/nowide/cstdio.hpp>
+#include "test.hpp"
 #ifdef BOOST_WINDOWS
 #include <errno.h>
 #endif
 
-#include "test.hpp"
-
 void test_main(int, char** argv, char**)
 {
     const std::string prefix = argv[0];

test/test_stdio.cpp

@@ -10,12 +10,11 @@
 #include <boost/nowide/cstdio.hpp>
 
 #include <boost/nowide/convert.hpp>
+#include "test.hpp"
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
 
-#include "test.hpp"
-
 bool file_exists(const std::string& filename)
 {
 #ifdef BOOST_WINDOWS

test/test_system.cpp

@@ -14,6 +14,7 @@
 #include <boost/nowide/args.hpp>
 #include <boost/nowide/utf/convert.hpp>
 #include <boost/nowide/utf/utf.hpp>
+#include "test.hpp"
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
@@ -21,8 +22,6 @@
 #include <string>
 #include <vector>
 
-#include "test.hpp"
-
 bool is_ascii(const std::string& s)
 {
     for(std::string::const_iterator it = s.begin(); it != s.end(); ++it)

test/test_traits.cpp

@@ -8,10 +8,9 @@
 
 #include <boost/nowide/detail/is_path.hpp>
 #include <boost/nowide/detail/is_string_container.hpp>
-
+#include "test.hpp"
 #include <iostream>
 #include <string>
-#include "test.hpp"
 
 #ifdef __has_include
 #if __has_include(<version>)