[libcxx-commits] [libcxx] 352945d - [libc++] Remove unused headers from <filesystem>
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Dec 22 17:09:04 PST 2021
Author: Nikolas Klauser
Date: 2021-12-23T02:07:47+01:00
New Revision: 352945dd36c64fd68b4c73fcc393ee5828da639a
URL: https://github.com/llvm/llvm-project/commit/352945dd36c64fd68b4c73fcc393ee5828da639a
DIFF: https://github.com/llvm/llvm-project/commit/352945dd36c64fd68b4c73fcc393ee5828da639a.diff
LOG: [libc++] Remove unused headers from <filesystem>
Remove unused headers from `<filesystem>`
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D116146
Added:
Modified:
libcxx/include/filesystem
libcxx/src/filesystem/directory_iterator.cpp
libcxx/src/filesystem/filesystem_common.h
libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp
libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp
libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp
libcxx/test/support/filesystem_test_helper.h
Removed:
################################################################################
diff --git a/libcxx/include/filesystem b/libcxx/include/filesystem
index 09d90614aa0d..6203b9a123cc 100644
--- a/libcxx/include/filesystem
+++ b/libcxx/include/filesystem
@@ -254,32 +254,9 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
#include<__filesystem/recursive_directory_iterator.h>
#include<__filesystem/space_info.h>
#include<__filesystem/u8path.h>
-
-#include <__availability>
-#include <__config>
-#include <__debug>
-#include <__ranges/enable_borrowed_range.h>
-#include <__ranges/enable_view.h>
-#include <__utility/forward.h>
-#include <chrono>
#include <compare>
-#include <cstddef>
-#include <cstdlib>
-#include <iosfwd>
-#include <iterator>
-#include <memory>
-#include <stack>
-#include <string>
-#include <string_view>
-#include <system_error>
-#include <utility>
#include <version>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
-# include <locale>
-# include <iomanip> // for quoted
-#endif
-
#if defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
# error "The Filesystem library is not supported since libc++ has been configured with LIBCXX_ENABLE_FILESYSTEM disabled"
#endif
diff --git a/libcxx/src/filesystem/directory_iterator.cpp b/libcxx/src/filesystem/directory_iterator.cpp
index 6219ceafd36e..90b255d9877f 100644
--- a/libcxx/src/filesystem/directory_iterator.cpp
+++ b/libcxx/src/filesystem/directory_iterator.cpp
@@ -6,8 +6,9 @@
//
//===----------------------------------------------------------------------===//
-#include "filesystem"
#include "__config"
+#include "filesystem"
+#include "stack"
#if defined(_LIBCPP_WIN32API)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
diff --git a/libcxx/src/filesystem/filesystem_common.h b/libcxx/src/filesystem/filesystem_common.h
index a2c340e61083..717894e537d2 100644
--- a/libcxx/src/filesystem/filesystem_common.h
+++ b/libcxx/src/filesystem/filesystem_common.h
@@ -17,6 +17,7 @@
#include "cstdlib"
#include "ctime"
#include "filesystem"
+#include "system_error"
#if !defined(_LIBCPP_WIN32API)
# include <unistd.h>
diff --git a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp
index f93737c2372d..bbeaedd51f22 100644
--- a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp
+++ b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp
@@ -14,12 +14,13 @@
// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../src/filesystem
-#include <filesystem>
+#include <cassert>
#include <chrono>
-#include <type_traits>
-#include <limits>
#include <cstddef>
-#include <cassert>
+#include <filesystem>
+#include <limits>
+#include <string>
+#include <type_traits>
#include "filesystem_common.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
index e71d4e24664a..f7e5770a7cd7 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
@@ -19,10 +19,10 @@
// bool operator> (directory_entry const&) const noexcept;
// bool operator>=(directory_entry const&) const noexcept;
-
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <type_traits>
+#include <utility>
#include "test_macros.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp
index 97b5d23d9dbb..403d1ae338dd 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp
@@ -19,8 +19,9 @@
// typedef ... iterator_category
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <iterator>
+#include <type_traits>
#include "test_macros.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp b/libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp
index 3c0ae5d0886c..8fd23b60081b 100644
--- a/libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp
@@ -21,8 +21,10 @@
// const path& path2() const noexcept;
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <system_error>
+#include <type_traits>
#include "test_macros.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp
index a7182557d3f7..9044b2f5a45e 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp
@@ -15,8 +15,9 @@
// path& operator=(path const&);
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <type_traits>
#include "test_macros.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp
index 69dff085e58f..0f3e4745fd53 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp
@@ -17,8 +17,9 @@
// path& operator=(path&&) noexcept
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <type_traits>
#include "test_macros.h"
#include "count_new.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp
index 31d00ffd2cd3..1155b7c1b3b5 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp
@@ -15,8 +15,9 @@
// path(path const&)
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <type_traits>
#include "test_macros.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp
index 40a8c54f802d..9f575ba61329 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp
@@ -16,8 +16,9 @@
// path(path&&) noexcept
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <type_traits>
#include "test_macros.h"
#include "count_new.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp
index e9e0a990165a..ab18399fd5d6 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp
@@ -17,8 +17,9 @@
// static constexpr value_type preferred_separator = ...;
#include "filesystem_include.h"
-#include <type_traits>
#include <cassert>
+#include <string>
+#include <type_traits>
#include "test_macros.h"
diff --git a/libcxx/test/support/filesystem_test_helper.h b/libcxx/test/support/filesystem_test_helper.h
index 00f4701e881a..44a01645dc49 100644
--- a/libcxx/test/support/filesystem_test_helper.h
+++ b/libcxx/test/support/filesystem_test_helper.h
@@ -14,9 +14,10 @@
#endif
#include <cassert>
+#include <chrono>
#include <cstdio> // for printf
#include <string>
-#include <chrono>
+#include <system_error>
#include <vector>
#include "make_string.h"
More information about the libcxx-commits
mailing list