[libcxx-commits] [libcxx] e2b15ec - [libc++] Rename __tuple_dir back to __tuple

Nikolas Klauser via libcxx-commits libcxx-commits at lists.llvm.org
Wed Apr 12 05:30:46 PDT 2023 

Author: Nikolas Klauser
Date: 2023-04-12T14:30:39+02:00
New Revision: e2b15ec235fed7e4ff1f99193c7bbffe830d4934

URL: https://github.com/llvm/llvm-project/commit/e2b15ec235fed7e4ff1f99193c7bbffe830d4934
DIFF: https://github.com/llvm/llvm-project/commit/e2b15ec235fed7e4ff1f99193c7bbffe830d4934.diff

LOG: [libc++] Rename __tuple_dir back to __tuple

This essentially reverts D139270

Reviewed By: #libc, EricWF

Spies: tahonermann, libcxx-commits, arichardson

Differential Revision: https://reviews.llvm.org/D147519

Added: 
    libcxx/include/__tuple/apply_cv.h
    libcxx/include/__tuple/make_tuple_types.h
    libcxx/include/__tuple/pair_like.h
    libcxx/include/__tuple/sfinae_helpers.h
    libcxx/include/__tuple/tuple_element.h
    libcxx/include/__tuple/tuple_indices.h
    libcxx/include/__tuple/tuple_like.h
    libcxx/include/__tuple/tuple_like_ext.h
    libcxx/include/__tuple/tuple_size.h
    libcxx/include/__tuple/tuple_types.h

Modified: 
    libcxx/include/CMakeLists.txt
    libcxx/include/__functional/hash.h
    libcxx/include/__fwd/get.h
    libcxx/include/__memory/compressed_pair.h
    libcxx/include/__ranges/elements_view.h
    libcxx/include/__ranges/subrange.h
    libcxx/include/__utility/pair.h
    libcxx/include/array
    libcxx/include/libcxx.imp
    libcxx/include/module.modulemap.in
    libcxx/include/optional
    libcxx/include/ranges
    libcxx/include/utility
    libcxx/test/libcxx/private_headers.verify.cpp
    libcxx/utils/data/ignore_format.txt
    libcxx/utils/generate_iwyu_mapping.py

Removed: 
    libcxx/include/__tuple_dir/apply_cv.h
    libcxx/include/__tuple_dir/make_tuple_types.h
    libcxx/include/__tuple_dir/pair_like.h
    libcxx/include/__tuple_dir/sfinae_helpers.h
    libcxx/include/__tuple_dir/tuple_element.h
    libcxx/include/__tuple_dir/tuple_indices.h
    libcxx/include/__tuple_dir/tuple_like.h
    libcxx/include/__tuple_dir/tuple_like_ext.h
    libcxx/include/__tuple_dir/tuple_size.h
    libcxx/include/__tuple_dir/tuple_types.h


################################################################################
diff  --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 35b1f46ad482a..439cdddbf40a4 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -596,16 +596,16 @@ set(files
   __thread/timed_backoff_policy.h
   __threading_support
   __tree
-  __tuple_dir/apply_cv.h
-  __tuple_dir/make_tuple_types.h
-  __tuple_dir/pair_like.h
-  __tuple_dir/sfinae_helpers.h
-  __tuple_dir/tuple_element.h
-  __tuple_dir/tuple_indices.h
-  __tuple_dir/tuple_like.h
-  __tuple_dir/tuple_like_ext.h
-  __tuple_dir/tuple_size.h
-  __tuple_dir/tuple_types.h
+  __tuple/apply_cv.h
+  __tuple/make_tuple_types.h
+  __tuple/pair_like.h
+  __tuple/sfinae_helpers.h
+  __tuple/tuple_element.h
+  __tuple/tuple_indices.h
+  __tuple/tuple_like.h
+  __tuple/tuple_like_ext.h
+  __tuple/tuple_size.h
+  __tuple/tuple_types.h
   __type_traits/add_const.h
   __type_traits/add_cv.h
   __type_traits/add_lvalue_reference.h

diff  --git a/libcxx/include/__functional/hash.h b/libcxx/include/__functional/hash.h
index 720b57c5ad5f5..fec7f75d3a11c 100644
--- a/libcxx/include/__functional/hash.h
+++ b/libcxx/include/__functional/hash.h
@@ -13,7 +13,7 @@
 #include <__functional/invoke.h>
 #include <__functional/unary_function.h>
 #include <__fwd/hash.h>
-#include <__tuple_dir/sfinae_helpers.h>
+#include <__tuple/sfinae_helpers.h>
 #include <__type_traits/is_copy_constructible.h>
 #include <__type_traits/is_default_constructible.h>
 #include <__type_traits/is_enum.h>

diff  --git a/libcxx/include/__fwd/get.h b/libcxx/include/__fwd/get.h
index ec1fab4602d7f..d04341496c60d 100644
--- a/libcxx/include/__fwd/get.h
+++ b/libcxx/include/__fwd/get.h
@@ -15,7 +15,7 @@
 #include <__fwd/pair.h>
 #include <__fwd/subrange.h>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/tuple_element.h>
+#include <__tuple/tuple_element.h>
 #include <cstddef>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

diff  --git a/libcxx/include/__memory/compressed_pair.h b/libcxx/include/__memory/compressed_pair.h
index 36cda6aacd504..d5986dab788f5 100644
--- a/libcxx/include/__memory/compressed_pair.h
+++ b/libcxx/include/__memory/compressed_pair.h
@@ -13,7 +13,7 @@
 #include <__config>
 #include <__fwd/get.h>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/tuple_indices.h>
+#include <__tuple/tuple_indices.h>
 #include <__type_traits/decay.h>
 #include <__type_traits/dependent_type.h>
 #include <__type_traits/enable_if.h>

diff  --git a/libcxx/include/__ranges/elements_view.h b/libcxx/include/__ranges/elements_view.h
index a80382b7fc42b..325e4c9dca639 100644
--- a/libcxx/include/__ranges/elements_view.h
+++ b/libcxx/include/__ranges/elements_view.h
@@ -26,9 +26,9 @@
 #include <__ranges/range_adaptor.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_like.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_like.h>
+#include <__tuple/tuple_size.h>
 #include <__type_traits/is_reference.h>
 #include <__type_traits/maybe_const.h>
 #include <__type_traits/remove_cv.h>

diff  --git a/libcxx/include/__ranges/subrange.h b/libcxx/include/__ranges/subrange.h
index 6ce7945e1b07c..b41b5db40ef05 100644
--- a/libcxx/include/__ranges/subrange.h
+++ b/libcxx/include/__ranges/subrange.h
@@ -29,9 +29,9 @@
 #include <__ranges/enable_borrowed_range.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
-#include <__tuple_dir/pair_like.h>
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/pair_like.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_size.h>
 #include <__type_traits/conditional.h>
 #include <__type_traits/decay.h>
 #include <__type_traits/is_pointer.h>

diff  --git a/libcxx/include/__tuple_dir/apply_cv.h b/libcxx/include/__tuple/apply_cv.h
similarity index 100%
rename from libcxx/include/__tuple_dir/apply_cv.h
rename to libcxx/include/__tuple/apply_cv.h

diff  --git a/libcxx/include/__tuple_dir/make_tuple_types.h b/libcxx/include/__tuple/make_tuple_types.h
similarity index 93%
rename from libcxx/include/__tuple_dir/make_tuple_types.h
rename to libcxx/include/__tuple/make_tuple_types.h
index 913ff9bbd60c5..38e2547d13dcf 100644
--- a/libcxx/include/__tuple_dir/make_tuple_types.h
+++ b/libcxx/include/__tuple/make_tuple_types.h
@@ -12,11 +12,11 @@
 #include <__config>
 #include <__fwd/array.h>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/apply_cv.h>
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_indices.h>
-#include <__tuple_dir/tuple_size.h>
-#include <__tuple_dir/tuple_types.h>
+#include <__tuple/apply_cv.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_indices.h>
+#include <__tuple/tuple_size.h>
+#include <__tuple/tuple_types.h>
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_reference.h>
 #include <cstddef>

diff  --git a/libcxx/include/__tuple_dir/pair_like.h b/libcxx/include/__tuple/pair_like.h
similarity index 92%
rename from libcxx/include/__tuple_dir/pair_like.h
rename to libcxx/include/__tuple/pair_like.h
index 87407ad95b6ff..192682dc7eb59 100644
--- a/libcxx/include/__tuple_dir/pair_like.h
+++ b/libcxx/include/__tuple/pair_like.h
@@ -10,8 +10,8 @@
 #define _LIBCPP___TUPLE_PAIR_LIKE_H
 
 #include <__config>
-#include <__tuple_dir/tuple_like.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/tuple_like.h>
+#include <__tuple/tuple_size.h>
 #include <__type_traits/remove_cvref.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

diff  --git a/libcxx/include/__tuple_dir/sfinae_helpers.h b/libcxx/include/__tuple/sfinae_helpers.h
similarity index 97%
rename from libcxx/include/__tuple_dir/sfinae_helpers.h
rename to libcxx/include/__tuple/sfinae_helpers.h
index 828821547a918..589f45056522f 100644
--- a/libcxx/include/__tuple_dir/sfinae_helpers.h
+++ b/libcxx/include/__tuple/sfinae_helpers.h
@@ -11,11 +11,11 @@
 
 #include <__config>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/make_tuple_types.h>
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_like_ext.h>
-#include <__tuple_dir/tuple_size.h>
-#include <__tuple_dir/tuple_types.h>
+#include <__tuple/make_tuple_types.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_like_ext.h>
+#include <__tuple/tuple_size.h>
+#include <__tuple/tuple_types.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/is_assignable.h>

diff  --git a/libcxx/include/__tuple_dir/tuple_element.h b/libcxx/include/__tuple/tuple_element.h
similarity index 97%
rename from libcxx/include/__tuple_dir/tuple_element.h
rename to libcxx/include/__tuple/tuple_element.h
index cb68cf6ae53c9..478dd089d46c6 100644
--- a/libcxx/include/__tuple_dir/tuple_element.h
+++ b/libcxx/include/__tuple/tuple_element.h
@@ -10,8 +10,8 @@
 #define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
 
 #include <__config>
-#include <__tuple_dir/tuple_indices.h>
-#include <__tuple_dir/tuple_types.h>
+#include <__tuple/tuple_indices.h>
+#include <__tuple/tuple_types.h>
 #include <__type_traits/add_const.h>
 #include <__type_traits/add_cv.h>
 #include <__type_traits/add_volatile.h>

diff  --git a/libcxx/include/__tuple_dir/tuple_indices.h b/libcxx/include/__tuple/tuple_indices.h
similarity index 100%
rename from libcxx/include/__tuple_dir/tuple_indices.h
rename to libcxx/include/__tuple/tuple_indices.h

diff  --git a/libcxx/include/__tuple_dir/tuple_like.h b/libcxx/include/__tuple/tuple_like.h
similarity index 100%
rename from libcxx/include/__tuple_dir/tuple_like.h
rename to libcxx/include/__tuple/tuple_like.h

diff  --git a/libcxx/include/__tuple_dir/tuple_like_ext.h b/libcxx/include/__tuple/tuple_like_ext.h
similarity index 97%
rename from libcxx/include/__tuple_dir/tuple_like_ext.h
rename to libcxx/include/__tuple/tuple_like_ext.h
index bf9869611273f..36f5c4896ffea 100644
--- a/libcxx/include/__tuple_dir/tuple_like_ext.h
+++ b/libcxx/include/__tuple/tuple_like_ext.h
@@ -13,7 +13,7 @@
 #include <__fwd/array.h>
 #include <__fwd/pair.h>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/tuple_types.h>
+#include <__tuple/tuple_types.h>
 #include <__type_traits/integral_constant.h>
 #include <cstddef>
 

diff  --git a/libcxx/include/__tuple_dir/tuple_size.h b/libcxx/include/__tuple/tuple_size.h
similarity index 98%
rename from libcxx/include/__tuple_dir/tuple_size.h
rename to libcxx/include/__tuple/tuple_size.h
index d551b2258cbaf..26f9d9725d316 100644
--- a/libcxx/include/__tuple_dir/tuple_size.h
+++ b/libcxx/include/__tuple/tuple_size.h
@@ -11,7 +11,7 @@
 
 #include <__config>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/tuple_types.h>
+#include <__tuple/tuple_types.h>
 #include <__type_traits/is_const.h>
 #include <__type_traits/is_volatile.h>
 #include <cstddef>

diff  --git a/libcxx/include/__tuple_dir/tuple_types.h b/libcxx/include/__tuple/tuple_types.h
similarity index 100%
rename from libcxx/include/__tuple_dir/tuple_types.h
rename to libcxx/include/__tuple/tuple_types.h

diff  --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
index 4ade56f3c3da7..77baba9821556 100644
--- a/libcxx/include/__utility/pair.h
+++ b/libcxx/include/__utility/pair.h
@@ -15,10 +15,10 @@
 #include <__functional/unwrap_ref.h>
 #include <__fwd/get.h>
 #include <__fwd/tuple.h>
-#include <__tuple_dir/sfinae_helpers.h>
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_indices.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/sfinae_helpers.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_indices.h>
+#include <__tuple/tuple_size.h>
 #include <__type_traits/common_reference.h>
 #include <__type_traits/common_type.h>
 #include <__type_traits/conditional.h>

diff  --git a/libcxx/include/array b/libcxx/include/array
index 09a3fe41f47d0..cdabc068c469c 100644
--- a/libcxx/include/array
+++ b/libcxx/include/array
@@ -115,7 +115,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <__iterator/reverse_iterator.h>
-#include <__tuple_dir/sfinae_helpers.h>
+#include <__tuple/sfinae_helpers.h>
 #include <__type_traits/conditional.h>
 #include <__type_traits/is_array.h>
 #include <__type_traits/is_const.h>
@@ -146,8 +146,8 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <initializer_list>
 
 // [tuple.helper]
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_size.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

diff  --git a/libcxx/include/libcxx.imp b/libcxx/include/libcxx.imp
index 4660eb987abae..daa9188544cb5 100644
--- a/libcxx/include/libcxx.imp
+++ b/libcxx/include/libcxx.imp
@@ -42,7 +42,7 @@
   { include: [ "@<__support/.*>", "private", "<support>", "public" ] },
   { include: [ "@<__system_error/.*>", "private", "<system_error>", "public" ] },
   { include: [ "@<__thread/.*>", "private", "<thread>", "public" ] },
-  { include: [ "@<__tuple_dir/.*>", "private", "<tuple>", "public" ] },
+  { include: [ "@<__tuple/.*>", "private", "<tuple>", "public" ] },
   { include: [ "@<__type_traits/.*>", "private", "<type_traits>", "public" ] },
   { include: [ "@<__utility/.*>", "private", "<utility>", "public" ] },
   { include: [ "@<__variant/.*>", "private", "<variant>", "public" ] },

diff  --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
index 243b96e643ad3..7a7edbfa7e939 100644
--- a/libcxx/include/module.modulemap.in
+++ b/libcxx/include/module.modulemap.in
@@ -1467,18 +1467,18 @@ module std [system] {
     header "tuple"
     export *
 
-    module apply_cv         { private header "__tuple_dir/apply_cv.h" }
+    module apply_cv         { private header "__tuple/apply_cv.h" }
     module get_fwd          { private header "__fwd/get.h" }
-    module make_tuple_types { private header "__tuple_dir/make_tuple_types.h" }
-    module pair_like        { private header "__tuple_dir/pair_like.h" }
-    module sfinae_helpers   { private header "__tuple_dir/sfinae_helpers.h" }
-    module tuple_element    { private header "__tuple_dir/tuple_element.h" }
+    module make_tuple_types { private header "__tuple/make_tuple_types.h" }
+    module pair_like        { private header "__tuple/pair_like.h" }
+    module sfinae_helpers   { private header "__tuple/sfinae_helpers.h" }
+    module tuple_element    { private header "__tuple/tuple_element.h" }
     module tuple_fwd        { private header "__fwd/tuple.h" }
-    module tuple_indices    { private header "__tuple_dir/tuple_indices.h" }
-    module tuple_like       { private header "__tuple_dir/tuple_like.h" }
-    module tuple_like_ext   { private header "__tuple_dir/tuple_like_ext.h" }
-    module tuple_size       { private header "__tuple_dir/tuple_size.h" }
-    module tuple_types      { private header "__tuple_dir/tuple_types.h" }
+    module tuple_indices    { private header "__tuple/tuple_indices.h" }
+    module tuple_like       { private header "__tuple/tuple_like.h" }
+    module tuple_like_ext   { private header "__tuple/tuple_like_ext.h" }
+    module tuple_size       { private header "__tuple/tuple_size.h" }
+    module tuple_types      { private header "__tuple/tuple_types.h" }
   }
   module type_traits {
     header "type_traits"

diff  --git a/libcxx/include/optional b/libcxx/include/optional
index 9f896bd16945a..ddb3f19b45a6a 100644
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -167,7 +167,7 @@ template<class T>
 #include <__functional/unary_function.h>
 #include <__memory/addressof.h>
 #include <__memory/construct_at.h>
-#include <__tuple_dir/sfinae_helpers.h>
+#include <__tuple/sfinae_helpers.h>
 #include <__type_traits/conjunction.h>
 #include <__type_traits/disjunction.h>
 #include <__type_traits/is_trivially_copy_assignable.h>

diff  --git a/libcxx/include/ranges b/libcxx/include/ranges
index 6adb28b09240d..8f3b4b21f622c 100644
--- a/libcxx/include/ranges
+++ b/libcxx/include/ranges
@@ -391,8 +391,8 @@ namespace std {
 #include <iterator>
 
 // [tuple.helper]
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_size.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

diff  --git a/libcxx/include/utility b/libcxx/include/utility
index d2f4218549196..1dc16b1158390 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -272,8 +272,8 @@ template <class T>
 #include <initializer_list>
 
 // [tuple.helper]
-#include <__tuple_dir/tuple_element.h>
-#include <__tuple_dir/tuple_size.h>
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_size.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

diff  --git a/libcxx/test/libcxx/private_headers.verify.cpp b/libcxx/test/libcxx/private_headers.verify.cpp
index 2287f1f6e4f0c..e201605d2db01 100644
--- a/libcxx/test/libcxx/private_headers.verify.cpp
+++ b/libcxx/test/libcxx/private_headers.verify.cpp
@@ -609,16 +609,16 @@ END-SCRIPT
 #include <__system_error/system_error.h> // expected-error@*:* {{use of private header from outside its module: '__system_error/system_error.h'}}
 #include <__thread/poll_with_backoff.h> // expected-error@*:* {{use of private header from outside its module: '__thread/poll_with_backoff.h'}}
 #include <__thread/timed_backoff_policy.h> // expected-error@*:* {{use of private header from outside its module: '__thread/timed_backoff_policy.h'}}
-#include <__tuple_dir/apply_cv.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/apply_cv.h'}}
-#include <__tuple_dir/make_tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/make_tuple_types.h'}}
-#include <__tuple_dir/pair_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/pair_like.h'}}
-#include <__tuple_dir/sfinae_helpers.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/sfinae_helpers.h'}}
-#include <__tuple_dir/tuple_element.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_element.h'}}
-#include <__tuple_dir/tuple_indices.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_indices.h'}}
-#include <__tuple_dir/tuple_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_like.h'}}
-#include <__tuple_dir/tuple_like_ext.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_like_ext.h'}}
-#include <__tuple_dir/tuple_size.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_size.h'}}
-#include <__tuple_dir/tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_types.h'}}
+#include <__tuple/apply_cv.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/apply_cv.h'}}
+#include <__tuple/make_tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/make_tuple_types.h'}}
+#include <__tuple/pair_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/pair_like.h'}}
+#include <__tuple/sfinae_helpers.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/sfinae_helpers.h'}}
+#include <__tuple/tuple_element.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_element.h'}}
+#include <__tuple/tuple_indices.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_indices.h'}}
+#include <__tuple/tuple_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_like.h'}}
+#include <__tuple/tuple_like_ext.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_like_ext.h'}}
+#include <__tuple/tuple_size.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_size.h'}}
+#include <__tuple/tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_types.h'}}
 #include <__type_traits/add_const.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_const.h'}}
 #include <__type_traits/add_cv.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_cv.h'}}
 #include <__type_traits/add_lvalue_reference.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_lvalue_reference.h'}}

diff  --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index de1834c8e27bf..f2d958060c8d1 100644
--- a/libcxx/utils/data/ignore_format.txt
+++ b/libcxx/utils/data/ignore_format.txt
@@ -616,14 +616,14 @@ libcxx/include/__thread/poll_with_backoff.h
 libcxx/include/__thread/timed_backoff_policy.h
 libcxx/include/__tree
 libcxx/include/tuple
-libcxx/include/__tuple_dir/apply_cv.h
-libcxx/include/__tuple_dir/make_tuple_types.h
-libcxx/include/__tuple_dir/sfinae_helpers.h
-libcxx/include/__tuple_dir/tuple_element.h
-libcxx/include/__tuple_dir/tuple_indices.h
-libcxx/include/__tuple_dir/tuple_like_ext.h
-libcxx/include/__tuple_dir/tuple_size.h
-libcxx/include/__tuple_dir/tuple_types.h
+libcxx/include/__tuple/apply_cv.h
+libcxx/include/__tuple/make_tuple_types.h
+libcxx/include/__tuple/sfinae_helpers.h
+libcxx/include/__tuple/tuple_element.h
+libcxx/include/__tuple/tuple_indices.h
+libcxx/include/__tuple/tuple_like_ext.h
+libcxx/include/__tuple/tuple_size.h
+libcxx/include/__tuple/tuple_types.h
 libcxx/include/typeindex
 libcxx/include/typeinfo
 libcxx/include/__type_traits/add_const.h

diff  --git a/libcxx/utils/generate_iwyu_mapping.py b/libcxx/utils/generate_iwyu_mapping.py
index c4c502ee42178..16db78df6502f 100644
--- a/libcxx/utils/generate_iwyu_mapping.py
+++ b/libcxx/utils/generate_iwyu_mapping.py
@@ -30,7 +30,7 @@ def generate_map(include):
             c_headers.append(i.name)
 
     result = []
-    temporary_mappings = {'__tuple_dir': 'tuple'}
+    temporary_mappings = {}
     for i in detail_directories:
         public_header = temporary_mappings.get(i, i.lstrip('_'))
         result.append(f'{generate(f"@<{i}/.*>", public_header)},')

More information about the libcxx-commits mailing list