!177 Remove redundant header files and indirect references

Merge pull request !177 from 徐城/remove_redundant_header_files_and_indirect_references
2024-11-23 14:50:51 +00:00 · 2022-07-20 13:28:51 +00:00 · 2022-07-20 13:28:51 +00:00 · 4e3c78d612
commit 4e3c78d612
parent afd9b25272 59d4888d21
24 changed files with 96 additions and 51 deletions
--- a/libpandabase/mem/mem_config.h
+++ b/libpandabase/mem/mem_config.h
@ -16,12 +16,10 @@
 #ifndef PANDA_RUNTIME_MEM_MEM_CONFIG_H
 #define PANDA_RUNTIME_MEM_MEM_CONFIG_H

-#include "macros.h"
-#include "libpandabase/mem/mem.h"
-#include "utils/asan_interface.h"
-
 #include <cstddef>

+#include "macros.h"
+
 namespace panda::mem {

 /**
--- a/libpandabase/mem/pool_map.cpp
+++ b/libpandabase/mem/pool_map.cpp
@ -15,6 +15,9 @@

 #include "pool_map.h"

+#include "mem/mem.h"
+#include "mem/space.h"
+
 namespace panda {

 void PoolMap::AddPoolToMap(const void *pool_addr, size_t pool_size, SpaceType space_type, AllocatorType allocator_type,
--- a/libpandabase/mem/pool_map.h
+++ b/libpandabase/mem/pool_map.h
@ -16,8 +16,10 @@
 #ifndef LIBPANDABASE_MEM_POOL_MAP_H
 #define LIBPANDABASE_MEM_POOL_MAP_H

-#include <cstddef>
 #include <array>
+#include <cstddef>
+#include <cstdint>
+
 #include "macros.h"
 #include "mem.h"
 #include "space.h"
--- a/libpandabase/os/dfx_option.cpp
+++ b/libpandabase/os/dfx_option.cpp
@ -15,6 +15,8 @@

 #include "dfx_option.h"

+#include "macros.h"
+
 namespace panda::os::dfx_option {

 /* static */
--- a/libpandabase/os/dfx_option.h
+++ b/libpandabase/os/dfx_option.h
@ -16,9 +16,8 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_DFX_OPTION_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_DFX_OPTION_H_

-#include "macros.h"
-
 #include <cstdint>
+#include <iosfwd>
 #include <string>

 namespace panda::os::dfx_option {
--- a/libpandabase/os/filesystem.cpp
+++ b/libpandabase/os/filesystem.cpp
@ -14,14 +14,19 @@
 */

 #include "os/filesystem.h"
-#include "utils/logger.h"
-#if defined PANDA_TARGET_MOBILE || defined PANDA_TARGET_UNIX || defined PANDA_TARGET_ARM32 || defined PANDA_TARGET_ARM64
+
+#include <ostream>
+#include <string>
+#if defined PANDA_TARGET_MOBILE || defined PANDA_TARGET_UNIX || defined PANDA_TARGET_ARM32 || \
+    defined PANDA_TARGET_ARM64
 #include <sys/stat.h>
 #endif
 #if defined(PANDA_TARGET_WINDOWS)
 #include <fileapi.h>
 #endif

+#include "utils/logger.h"
+
 namespace panda::os {

 void CreateDirectories(const std::string &folder_name)
--- a/libpandabase/os/filesystem.h
+++ b/libpandabase/os/filesystem.h
@ -16,17 +16,15 @@
 #ifndef PANDA_FILESYSTEM_H
 #define PANDA_FILESYSTEM_H

+#include <iosfwd>
+#include <string_view>
+
 #include "macros.h"
-#include <string>

 #if defined(PANDA_TARGET_WINDOWS)
 #ifndef NAME_MAX
 constexpr size_t NAME_MAX = 255;
 #endif  // NAME_MAX
-#elif defined(USE_STD_FILESYSTEM)
-#include <filesystem>
-#else
-#include <experimental/filesystem>
 #endif

 namespace panda::os {
--- a/libpandabase/os/native_stack.h
+++ b/libpandabase/os/native_stack.h
@ -16,14 +16,14 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_NATIVESTACK_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_NATIVESTACK_H_

-#include "os/thread.h"
+#include <set>
+#include <signal.h>  // NOLINTNEXTLINE(modernize-deprecated-headers)
+#include <string>
+
 #if defined(PANDA_TARGET_UNIX)
 #include "platforms/unix/libpandabase/native_stack.h"
 #endif  // PANDA_TARGET_UNIX
-
-#include <string>
-#include <set>
-#include <signal.h>  // NOLINTNEXTLINE(modernize-deprecated-headers)
+#include "os/thread.h"

 namespace panda::os::native_stack {

--- a/libpandabase/os/property.h
+++ b/libpandabase/os/property.h
@ -16,12 +16,12 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_PROP_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_PROP_H_

+#include <string>
+
 #if defined(PANDA_TARGET_UNIX)
 #include "platforms/unix/libpandabase/property.h"
 #endif  // PANDA_TARGET_UNIX

-#include <string>
-
 namespace panda::os::property {

 #if defined(PANDA_TARGET_UNIX)
--- a/libpandabase/os/stacktrace_stub.cpp
+++ b/libpandabase/os/stacktrace_stub.cpp
@ -15,6 +15,10 @@

 #include "stacktrace.h"

+#include <cstdint>
+#include <iosfwd>
+#include <vector>
+
 namespace panda {

 std::vector<uintptr_t> GetStacktrace()
--- a/libpandabase/os/time.cpp
+++ b/libpandabase/os/time.cpp
@ -15,6 +15,17 @@

 #include "os/time.h"

+#include <chrono>
+#include <ctime>
+
+#ifdef PANDA_TARGET_UNIX
+#include "platforms/unix/libpandabase/time.h"
+#elif PANDA_TARGET_WINDOWS
+#include "platforms/windows/libpandabase/time.h"
+#else
+#error "Unsupported platform"
+#endif  // PANDA_TARGET_UNIX
+
 namespace panda::os::time {

 /**
--- a/libpandabase/os/time.h
+++ b/libpandabase/os/time.h
@ -16,14 +16,6 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_TIME_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_TIME_H_

-#ifdef PANDA_TARGET_UNIX
-#include "platforms/unix/libpandabase/time.h"
-#elif PANDA_TARGET_WINDOWS
-#include "platforms/windows/libpandabase/time.h"
-#else
-#error "Unsupported platform"
-#endif  // PANDA_TARGET_UNIX
-
 #include <macros.h>

 #include <cstdint>
--- a/libpandabase/trace/trace.h
+++ b/libpandabase/trace/trace.h
@ -16,8 +16,11 @@
 #ifndef PANDA_TRACE_H_
 #define PANDA_TRACE_H_

-#include <string>
+#include <cstdint>
+#include <iosfwd>
 #include <sstream>
+#include <string>
+
 #include "macros.h"

 namespace panda::trace {
--- a/libpandabase/utils/terminate.cpp
+++ b/libpandabase/utils/terminate.cpp
@ -13,7 +13,9 @@
 * limitations under the License.
 */

+#include <cstdlib>
 #include <cstring>
+#include <iosfwd>
 #include <string>

 #include "securec.h"
--- a/libpandabase/utils/type_converter.cpp
+++ b/libpandabase/utils/type_converter.cpp
@ -15,11 +15,14 @@

 #include "type_converter.h"

+#include <algorithm>
 #include <array>
-#include <cassert>
 #include <cmath>
 #include <iomanip>
+#include <ios>
+#include <ostream>
 #include <string_view>
+#include <variant>

 namespace panda::helpers {

--- a/libpandabase/utils/type_converter.h
+++ b/libpandabase/utils/type_converter.h
@ -17,9 +17,9 @@
 #define PANDA_LIBPANDABASE_UTILS_TYPE_CONVERTER_H_

 #include <array>
-#include <cassert>
-#include <cmath>
-#include <iomanip>
+#include <cstddef>
+#include <cstdint>
+#include <iosfwd>
 #include <string_view>
 #include <variant>

--- a/platforms/unix/libpandabase/error.cpp
+++ b/platforms/unix/libpandabase/error.cpp
@ -15,10 +15,11 @@

 #include "os/error.h"

-#include <cerrno>
-#include <cstring>
-
 #include <array>
+#include <cstring>
+#include <iosfwd>
+#include <string>
+#include <variant>

 namespace panda::os {

--- a/platforms/unix/libpandabase/exec.cpp
+++ b/platforms/unix/libpandabase/exec.cpp
@ -15,10 +15,17 @@

 #include "os/exec.h"

-#include <cstring>
+#include <cerrno>
+#include <iosfwd>
+#include <string>
 #include <unistd.h>
+
+#include "macros.h"
+#include "os/error.h"
 #include "os/failure_retry.h"
 #include "sys/wait.h"
+#include "utils/expected.h"
+#include "utils/span.h"

 namespace panda::os::exec {

--- a/platforms/unix/libpandabase/file.cpp
+++ b/platforms/unix/libpandabase/file.cpp
@ -14,12 +14,11 @@
 */

 #include "os/file.h"
-#include "utils/type_helpers.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>

 #include <fcntl.h>
+#include <string_view>
+
+#include "macros.h"

 namespace panda::os::file {

--- a/platforms/unix/libpandabase/file.h
+++ b/platforms/unix/libpandabase/file.h
@ -16,25 +16,28 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_UNIX_FILE_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_UNIX_FILE_H_

-#include "os/error.h"
-#include "utils/expected.h"
-#include "utils/logger.h"
-
 #include <array>
 #include <cerrno>
 #include <climits>
 #include <cstddef>
+#include <cstdint>
 #include <cstdlib>
+#include <iosfwd>
 #if PANDA_TARGET_MACOS
 #include <mach-o/dyld.h>
 // Undefine the conflict Mac marco
 #undef BYTE_SIZE
 #endif
+#include <ostream>
 #include <string>
+#include <string_view>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
-#include <utility>
+
+#include "macros.h"
+#include "os/error.h"
+#include "utils/expected.h"
+#include "utils/logger.h"

 namespace panda::os::unix::file {

--- a/platforms/unix/libpandabase/filesystem.cpp
+++ b/platforms/unix/libpandabase/filesystem.cpp
@ -18,6 +18,9 @@
 #include <array>
 #include <climits>
 #include <cstdlib>
+#include <iosfwd>
+#include <string>
+#include <string_view>

 namespace panda::os {

--- a/platforms/unix/libpandabase/library_loader_load.cpp
+++ b/platforms/unix/libpandabase/library_loader_load.cpp
@ -16,6 +16,12 @@
 #include "os/library_loader.h"

 #include <dlfcn.h>
+#include <iosfwd>
+#include <string>
+#include <string_view>
+
+#include "os/error.h"
+#include "utils/expected.h"

 namespace panda::os::library_loader {
 Expected<LibraryHandle, Error> Load(std::string_view filename)
--- a/platforms/unix/libpandabase/library_loader_resolve_symbol.cpp
+++ b/platforms/unix/libpandabase/library_loader_resolve_symbol.cpp
@ -16,6 +16,12 @@
 #include "os/library_loader.h"

 #include <dlfcn.h>
+#include <iosfwd>
+#include <string>
+#include <string_view>
+
+#include "os/error.h"
+#include "utils/expected.h"

 namespace panda::os::library_loader {

--- a/platforms/unix/libpandabase/property.h
+++ b/platforms/unix/libpandabase/property.h
@ -16,9 +16,7 @@
 #ifndef PANDA_LIBPANDABASE_PBASE_OS_UNIX_PROP_H_
 #define PANDA_LIBPANDABASE_PBASE_OS_UNIX_PROP_H_

-#include <string>
-#include <vector>
-#include <map>
+#include <iosfwd>

 namespace panda::os::unix::property {