uncrustify: sort std includes

bradjc · bradjc · commit f221ae8b2a01 · 2025-07-16T09:42:41.000-07:00
Use a more manual approach to select all common std C headers.
diff --git a/examples/ble-uart/main.c b/examples/ble-uart/main.c
@@ -1,14 +1,15 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <ble_advdata.h>
 #include <eddystone.h>
 #include <nordic_common.h>
 #include <nrf_error.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/interface/console.h>
diff --git a/examples/ble_advertising/main.c b/examples/ble_advertising/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock/net/ble.h>
 #include <libtock/tock.h>
 
diff --git a/examples/services/ble-env-sense/env_sense_service.c b/examples/services/ble-env-sense/env_sense_service.c
@@ -1,8 +1,9 @@
-#include <app_error.h>
-#include <ble.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <app_error.h>
+#include <ble.h>
+
 #include "env_sense_service.h"
 
 static uint16_t service_handle;
diff --git a/examples/services/ble-env-sense/main.c b/examples/services/ble-env-sense/main.c
@@ -1,15 +1,16 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <ble_advdata.h>
 #include <eddystone.h>
 #include <nordic_common.h>
 #include <nrf.h>
 #include <nrf_error.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <libtock/kernel/ipc.h>
 #include <libtock/net/nrf51_serialization.h>
diff --git a/examples/tests/ble/ble_gap_library/main.c b/examples/tests/ble/ble_gap_library/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/services/alarm.h>
 #include <libtock/tock.h>
 
diff --git a/examples/tests/ble/ble_nrf5x_concurrency/Advertiser1/main.c b/examples/tests/ble/ble_nrf5x_concurrency/Advertiser1/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/services/alarm.h>
 #include <libtock/net/ble.h>
 #include <libtock/tock.h>
diff --git a/examples/tests/ble/ble_nrf5x_concurrency/Advertiser2/main.c b/examples/tests/ble/ble_nrf5x_concurrency/Advertiser2/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/services/alarm.h>
 #include <libtock/net/ble.h>
 #include <libtock/tock.h>
diff --git a/examples/tests/ble/ble_nrf5x_concurrency/Advertiser3/main.c b/examples/tests/ble/ble_nrf5x_concurrency/Advertiser3/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/services/alarm.h>
 #include <libtock/net/ble.h>
 #include <libtock/tock.h>
diff --git a/examples/tests/ble/ble_nrf5x_concurrency/Advertiser4/main.c b/examples/tests/ble/ble_nrf5x_concurrency/Advertiser4/main.c
@@ -1,7 +1,8 @@
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/services/alarm.h>
 #include <libtock/net/ble.h>
 #include <libtock/tock.h>
diff --git a/examples/tests/hail/main.c b/examples/tests/hail/main.c
@@ -1,10 +1,11 @@
+#include <stdbool.h>
+#include <stdio.h>
+
 #include <ble_advdata.h>
 #include <nordic_common.h>
 #include <nrf_error.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
-#include <stdbool.h>
-#include <stdio.h>
 
 #include <libtock-sync/peripherals/adc.h>
 #include <libtock-sync/peripherals/crc.h>
diff --git a/examples/tests/imix/main.c b/examples/tests/imix/main.c
@@ -1,11 +1,12 @@
-#include <ble_advdata.h>
 #include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include <ble_advdata.h>
 #include <nordic_common.h>
 #include <nrf_error.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
-#include <stdbool.h>
-#include <stdio.h>
 
 #include <libtock-sync/peripherals/adc.h>
 #include <libtock-sync/peripherals/crc.h>
diff --git a/examples/tests/microbit_v2/main.c b/examples/tests/microbit_v2/main.c
@@ -1,9 +1,10 @@
 // Micro:bit v2 testing application.
 // This app is modeled after the Hail test app by bradjc.
 
-#include <gap.h>
 #include <stdio.h>
 
+#include <gap.h>
+
 #include <libtock-sync/peripherals/adc.h>
 #include <libtock-sync/peripherals/crc.h>
 #include <libtock-sync/peripherals/rng.h>
diff --git a/examples/tests/u8g2-demos/circle/main.c b/examples/tests/u8g2-demos/circle/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/count/main.c b/examples/tests/u8g2-demos/count/main.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/graph/main.c b/examples/tests/u8g2-demos/graph/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/increment/main.c b/examples/tests/u8g2-demos/increment/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/spin/main.c b/examples/tests/u8g2-demos/spin/main.c
@@ -1,6 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/tock-logo/main.c b/examples/tests/u8g2-demos/tock-logo/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/tock-scroll/main.c b/examples/tests/u8g2-demos/tock-scroll/main.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tests/u8g2-demos/triangle/main.c b/examples/tests/u8g2-demos/triangle/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/dynamic-apps-and-policies/counter/main.c b/examples/tutorials/dynamic-apps-and-policies/counter/main.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/dynamic-apps-and-policies/temperature/main.c b/examples/tutorials/dynamic-apps-and-policies/temperature/main.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/hotp/hotp_milestone_one/screen.c b/examples/tutorials/hotp/hotp_milestone_one/screen.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/root_of_trust/screen/main.c b/examples/tutorials/root_of_trust/screen/main.c
@@ -1,7 +1,8 @@
-#include <mui.h>
-#include <mui_u8g2.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <mui.h>
+#include <mui_u8g2.h>
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/thread_tutorials/temperature_sensor/08_screen_u8g2/main.c b/examples/tutorials/thread_tutorials/temperature_sensor/08_screen_u8g2/main.c
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/thread_tutorials/temperature_sensor/09_screen_final/main.c b/examples/tutorials/thread_tutorials/temperature_sensor/09_screen_final/main.c
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/tutorials/thread_tutorials/temperature_sensor/10_screen_ipc/main.c b/examples/tutorials/thread_tutorials/temperature_sensor/10_screen_ipc/main.c
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <u8g2-tock.h>
 #include <u8g2.h>
 
diff --git a/examples/witenergy/main.c b/examples/witenergy/main.c
@@ -1,3 +1,9 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <ble_conn_params.h>
 #include <ble_db_discovery.h>
 #include <ble_stack_handler_types.h>
@@ -7,11 +13,6 @@
 #include <nrf_sdm.h>
 #include <simple_ble.h>
 #include <softdevice_handler.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <libtock-sync/services/alarm.h>
 #include <libtock/interface/button.h>
diff --git a/tools/uncrustify/uncrustify.cfg b/tools/uncrustify/uncrustify.cfg
@@ -92,10 +92,10 @@ mod_remove_duplicate_include    = true
 mod_sort_include                = true
 mod_sort_incl_import_grouping_enabled = true
 # Sort includes with:
-# 1. Toolchain-level includes (ie without a "/" or that are in "sys/").
+# 1. Toolchain-level includes (ie std*, in "sys/", or specific headers).
 # 2. Library includes not including libtock.
 # 3. libtock and libtock-sync includes.
 # 4. Local includes using "".
-include_category_0              = ^<(sys\/.*|[^\/]*)\.h>
+include_category_0              = ^<(math|string|assert|unistd|limits|ctype|errno|inttypes|std.*|sys\/.*)\.h>
 include_category_1              = ^<(?:(?!libtock).)+.*\.h>
 include_category_2              = ^<.*
