Configure include cleaner

IvanoBilenchi · May 31, 2024 · 65b8f5e · 65b8f5e
1 parent 2b15216
commit 65b8f5e
Show file tree

Hide file tree

Showing 39 changed files with 125 additions and 53 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -2,10 +2,9 @@
 Checks: >
   -*,
   clang-analyzer-*,
+  -clang-analyzer-cplusplus-*,
   -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
-  modernize-*,
-  -modernize-macro-to-enum,
-  -modernize-redundant-void-arg,
-  -modernize-use-trailing-return-type,
+  misc-header-include-cycle,
+  misc-include-cleaner,
   performance-*,
   portability-*
diff --git a/.clangd b/.clangd
@@ -0,0 +1,3 @@
+---
+Diagnostics:
+  Suppress: unused-includes
diff --git a/include/ubit.h b/include/ubit.h
@@ -12,7 +12,9 @@
 #ifndef UBIT_H
 #define UBIT_H
 
-#include "ustd.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include "uutils.h"
 
 /**
  * References a specific bitmask type.

diff --git a/include/uhash.h b/include/uhash.h
@@ -14,8 +14,12 @@
 #ifndef UHASH_H
 #define UHASH_H
 
-#include "uhash_func.h"
-#include "ustd.h"
+#include "ualloc.h"
+#include "uhash_func.h" // IWYU pragma: export
+#include "unumber.h"
+#include "uutils.h"
+#include <stdint.h>
+#include <string.h>
 
 // Types
 

diff --git a/include/uhash_builtin.h b/include/uhash_builtin.h
@@ -13,6 +13,7 @@
 #define UHASH_BUILTIN_H
 
 #include "uhash.h" // IWYU pragma: export
+#include "unumber.h"
 #include "ustring.h"
 
 ULIB_BEGIN_DECLS

diff --git a/include/uhash_func.h b/include/uhash_func.h
@@ -12,7 +12,9 @@
 #ifndef UHASH_FUNC_H
 #define UHASH_FUNC_H
 
-#include "ustd.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include <stddef.h>
 
 ULIB_BEGIN_DECLS
 

diff --git a/include/ulib.h b/include/ulib.h
@@ -24,7 +24,6 @@
 #include "umeta.h"
 #include "unumber.h"
 #include "urand.h"
-#include "ustd.h"
 #include "ustrbuf.h"
 #include "ustream.h"
 #include "ustring.h"

diff --git a/include/ustd.h b/include/ustd.h
diff --git a/include/ustream.h b/include/ustream.h
@@ -12,9 +12,9 @@
 #ifndef USTREAM_H
 #define USTREAM_H
 
-#include "ustd.h"
 #include "ustrbuf.h"
 #include "utime.h"
+#include <stdio.h>
 
 ULIB_BEGIN_DECLS
 

diff --git a/include/ustring_raw.h b/include/ustring_raw.h
@@ -12,7 +12,11 @@
 #ifndef USTRING_RAW_H
 #define USTRING_RAW_H
 
-#include "ustd.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
 
 ULIB_BEGIN_DECLS
 

diff --git a/include/utest.h b/include/utest.h
@@ -12,8 +12,12 @@
 #ifndef UTEST_H
 #define UTEST_H
 
-#include "ustd.h"
+#include "uattrs.h"
 #include "uutils.h"
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 ULIB_BEGIN_DECLS
 

diff --git a/include/uvec.h b/include/uvec.h
@@ -12,8 +12,10 @@
 #ifndef UVEC_H
 #define UVEC_H
 
+#include "ualloc.h"
+#include "unumber.h"
 #include "urand.h" // IWYU pragma: keep, needed for urand_range
-#include "ustd.h"
+#include "uutils.h"
 
 ULIB_BEGIN_DECLS
 

diff --git a/src/uhash_builtin.c b/src/uhash_builtin.c
@@ -8,6 +8,8 @@
  */
 
 #include "uhash_builtin.h"
+#include "unumber.h" // IWYU pragma: keep, required for ulib_equals
+#include "ustring.h"
 
 UHASH_IMPL(ulib_int, ulib_hash_int, ulib_equals)
 UHASH_IMPL(ulib_uint, ulib_hash_int, ulib_equals)

diff --git a/src/umeta.c b/src/umeta.c
@@ -8,6 +8,7 @@
  */
 
 #include "umeta.h"
+#include "uversion.h"
 
 #ifndef ULIB_VERSION_MAJOR
 #define ULIB_VERSION_MAJOR 0

diff --git a/src/urand.c b/src/urand.c
@@ -8,6 +8,12 @@
  */
 
 #include "urand.h"
+#include "ualloc.h"
+#include "unumber.h"
+#include "ustring.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
 // NOLINTBEGIN(clang-analyzer-security.insecureAPI.rand)
 

diff --git a/src/ustrbuf.c b/src/ustrbuf.c
@@ -8,6 +8,18 @@
  */
 
 #include "ustrbuf.h"
+#include "ualloc.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include "ustring.h"
+#include "ustring_raw.h"
+#include "uutils.h"
+#include "uvec_builtin.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
 uvec_ret ustrbuf_append_format(UStrBuf *buf, char const *format, ...) {
     va_list args;

diff --git a/src/ustream.c b/src/ustream.c
@@ -8,9 +8,19 @@
  */
 
 #include "ustream.h"
+#include "ualloc.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include "ustrbuf.h"
 #include "ustring.h"
+#include "ustring_raw.h"
+#include "utime.h"
+#include "uvec_builtin.h"
 #include "uversion.h"
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 typedef struct UStreamBuf {
     size_t size;

diff --git a/src/ustring.c b/src/ustring.c
@@ -8,8 +8,16 @@
  */
 
 #include "ustring.h"
+#include "ualloc.h"
+#include "uattrs.h"
+#include "ulib_ret.h"
+#include "unumber.h"
 #include "ustrbuf.h"
+#include "ustring_raw.h"
 #include "uutils.h"
+#include <limits.h>
+#include <stdarg.h>
+#include <string.h>
 
 UString const ustring_null = p_ustring_init_small(0);
 UString const ustring_empty = p_ustring_init_small(1);

diff --git a/src/ustring_raw.c b/src/ustring_raw.c
@@ -8,6 +8,11 @@
  */
 
 #include "ustring_raw.h"
+#include "ualloc.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 char *ulib_str_dup(char const *string, size_t length) {
     char *buf = ulib_malloc(length + 1);

diff --git a/src/utime.c b/src/utime.c
@@ -10,7 +10,13 @@
  */
 
 #include "utime.h"
+#include "uattrs.h"
+#include "unumber.h"
+#include "ustrbuf.h"
 #include "ustream.h"
+#include "ustring.h"
+#include "uutils.h"
+#include <stdlib.h>
 #include <time.h>
 
 #define NS_PER_NS (utime_ns)1

diff --git a/src/uvec_builtin.c b/src/uvec_builtin.c
@@ -8,6 +8,9 @@
  */
 
 #include "uvec_builtin.h"
+#include "ualloc.h"
+#include "unumber.h"
+#include "ustring.h"
 
 UVEC_IMPL_IDENTIFIABLE(char)
 UVEC_IMPL_IDENTIFIABLE(ulib_byte)

diff --git a/src/uversion.c b/src/uversion.c
@@ -8,7 +8,10 @@
  */
 
 #include "uversion.h"
+#include "ustrbuf.h"
 #include "ustream.h"
+#include "ustring.h"
+#include <stddef.h>
 
 int uversion_compare(UVersion lhs, UVersion rhs) {
     if (lhs.major < rhs.major) return -1;

diff --git a/test/bench.c b/test/bench.c
@@ -8,6 +8,9 @@
  */
 
 #include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define SORT_SEED 31
 #define SORT_COUNT_SMALL 16

diff --git a/test/tests/ubit_tests.c b/test/tests/ubit_tests.c
@@ -9,6 +9,7 @@
 
 #include "ubit.h"
 #include "utest.h"
+#include <stdint.h>
 
 #define ubit_test_impl(N)                                                                          \
     bool ubit_test_##N(void) {                                                                     \

diff --git a/test/tests/ubit_tests.h b/test/tests/ubit_tests.h
@@ -10,7 +10,7 @@
 #ifndef UBIT_TESTS_H
 #define UBIT_TESTS_H
 
-#include "ustd.h"
+#include <stdbool.h>
 
 bool ubit_test_8(void);
 bool ubit_test_16(void);

diff --git a/test/tests/uhash_tests.c b/test/tests/uhash_tests.c
@@ -8,7 +8,10 @@
  */
 
 #include "uhash.h"
+#include "unumber.h"
 #include "utest.h"
+#include <stddef.h>
+#include <stdint.h>
 
 #define MAX_VAL 100
 

diff --git a/test/tests/uhash_tests.h b/test/tests/uhash_tests.h
@@ -10,7 +10,7 @@
 #ifndef UHASH_TESTS_H
 #define UHASH_TESTS_H
 
-#include "ustd.h"
+#include <stdbool.h>
 
 bool uhash_test_memory(void);
 bool uhash_test_base(void);

diff --git a/test/tests/urand_tests.c b/test/tests/urand_tests.c
@@ -8,9 +8,13 @@
  */
 
 #include "urand_tests.h"
+#include "unumber.h"
 #include "urand.h"
+#include "ustring.h"
 #include "utest.h"
 #include "uvec_builtin.h"
+#include <stddef.h>
+#include <string.h>
 
 bool urand_int_test(void) {
     urand_set_seed(12345);

diff --git a/test/tests/urand_tests.h b/test/tests/urand_tests.h
@@ -10,7 +10,7 @@
 #ifndef URAND_TESTS_H
 #define URAND_TESTS_H
 
-#include "ustd.h"
+#include <stdbool.h>
 
 bool urand_int_test(void);
 bool urand_float_test(void);

diff --git a/test/tests/ustream_tests.c b/test/tests/ustream_tests.c
@@ -8,8 +8,12 @@
  */
 
 #include "ustream_tests.h"
+#include "ualloc.h"
 #include "ustream.h"
 #include "utest.h"
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 #define USTREAM_INPUT_FILE "ustream_input.txt"
 #define USTREAM_OUTPUT_FILE "ustream_output.txt"

diff --git a/test/tests/ustream_tests.h b/test/tests/ustream_tests.h
@@ -10,7 +10,7 @@
 #ifndef USTREAM_TESTS_H
 #define USTREAM_TESTS_H
 
-#include "ustd.h"
+#include <stdbool.h>
 
 bool uistream_path_test(void);
 bool uistream_buf_test(void);

diff --git a/test/tests/ustring_tests.c b/test/tests/ustring_tests.c
@@ -8,9 +8,16 @@
  */
 
 #include "ustring_tests.h"
+#include "ualloc.h"
+#include "ulib_ret.h"
+#include "unumber.h"
 #include "ustrbuf.h"
 #include "ustring.h"
+#include "ustring_raw.h"
 #include "utest.h"
+#include "uutils.h"
+#include "uvec.h"
+#include <stddef.h>
 
 #define MAX_ASCII 127