Skip to content

Commit e2b15ec

Browse files
philnik777philnik777
committed
[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
1 parent 1a8f3f9 commit e2b15ec

26 files changed

+77
-77
lines changed

‎libcxx/include/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -596,16 +596,16 @@ set(files
596596
__thread/timed_backoff_policy.h
597597
__threading_support
598598
__tree
599-
__tuple_dir/apply_cv.h
600-
__tuple_dir/make_tuple_types.h
601-
__tuple_dir/pair_like.h
602-
__tuple_dir/sfinae_helpers.h
603-
__tuple_dir/tuple_element.h
604-
__tuple_dir/tuple_indices.h
605-
__tuple_dir/tuple_like.h
606-
__tuple_dir/tuple_like_ext.h
607-
__tuple_dir/tuple_size.h
608-
__tuple_dir/tuple_types.h
599+
__tuple/apply_cv.h
600+
__tuple/make_tuple_types.h
601+
__tuple/pair_like.h
602+
__tuple/sfinae_helpers.h
603+
__tuple/tuple_element.h
604+
__tuple/tuple_indices.h
605+
__tuple/tuple_like.h
606+
__tuple/tuple_like_ext.h
607+
__tuple/tuple_size.h
608+
__tuple/tuple_types.h
609609
__type_traits/add_const.h
610610
__type_traits/add_cv.h
611611
__type_traits/add_lvalue_reference.h

‎libcxx/include/__functional/hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__functional/invoke.h>
1414
#include <__functional/unary_function.h>
1515
#include <__fwd/hash.h>
16-
#include <__tuple_dir/sfinae_helpers.h>
16+
#include <__tuple/sfinae_helpers.h>
1717
#include <__type_traits/is_copy_constructible.h>
1818
#include <__type_traits/is_default_constructible.h>
1919
#include <__type_traits/is_enum.h>

‎libcxx/include/__fwd/get.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <__fwd/pair.h>
1616
#include <__fwd/subrange.h>
1717
#include <__fwd/tuple.h>
18-
#include <__tuple_dir/tuple_element.h>
18+
#include <__tuple/tuple_element.h>
1919
#include <cstddef>
2020

2121
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__memory/compressed_pair.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__config>
1414
#include <__fwd/get.h>
1515
#include <__fwd/tuple.h>
16-
#include <__tuple_dir/tuple_indices.h>
16+
#include <__tuple/tuple_indices.h>
1717
#include <__type_traits/decay.h>
1818
#include <__type_traits/dependent_type.h>
1919
#include <__type_traits/enable_if.h>

‎libcxx/include/__ranges/elements_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include <__ranges/range_adaptor.h>
2727
#include <__ranges/size.h>
2828
#include <__ranges/view_interface.h>
29-
#include <__tuple_dir/tuple_element.h>
30-
#include <__tuple_dir/tuple_like.h>
31-
#include <__tuple_dir/tuple_size.h>
29+
#include <__tuple/tuple_element.h>
30+
#include <__tuple/tuple_like.h>
31+
#include <__tuple/tuple_size.h>
3232
#include <__type_traits/is_reference.h>
3333
#include <__type_traits/maybe_const.h>
3434
#include <__type_traits/remove_cv.h>

‎libcxx/include/__ranges/subrange.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <__ranges/enable_borrowed_range.h>
3030
#include <__ranges/size.h>
3131
#include <__ranges/view_interface.h>
32-
#include <__tuple_dir/pair_like.h>
33-
#include <__tuple_dir/tuple_element.h>
34-
#include <__tuple_dir/tuple_size.h>
32+
#include <__tuple/pair_like.h>
33+
#include <__tuple/tuple_element.h>
34+
#include <__tuple/tuple_size.h>
3535
#include <__type_traits/conditional.h>
3636
#include <__type_traits/decay.h>
3737
#include <__type_traits/is_pointer.h>

‎libcxx/include/__tuple_dir/apply_cv.h renamed to ‎libcxx/include/__tuple/apply_cv.h

File renamed without changes.

‎libcxx/include/__tuple_dir/make_tuple_types.h renamed to ‎libcxx/include/__tuple/make_tuple_types.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <__config>
1313
#include <__fwd/array.h>
1414
#include <__fwd/tuple.h>
15-
#include <__tuple_dir/apply_cv.h>
16-
#include <__tuple_dir/tuple_element.h>
17-
#include <__tuple_dir/tuple_indices.h>
18-
#include <__tuple_dir/tuple_size.h>
19-
#include <__tuple_dir/tuple_types.h>
15+
#include <__tuple/apply_cv.h>
16+
#include <__tuple/tuple_element.h>
17+
#include <__tuple/tuple_indices.h>
18+
#include <__tuple/tuple_size.h>
19+
#include <__tuple/tuple_types.h>
2020
#include <__type_traits/remove_cv.h>
2121
#include <__type_traits/remove_reference.h>
2222
#include <cstddef>

‎libcxx/include/__tuple_dir/pair_like.h renamed to ‎libcxx/include/__tuple/pair_like.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_PAIR_LIKE_H
1111

1212
#include <__config>
13-
#include <__tuple_dir/tuple_like.h>
14-
#include <__tuple_dir/tuple_size.h>
13+
#include <__tuple/tuple_like.h>
14+
#include <__tuple/tuple_size.h>
1515
#include <__type_traits/remove_cvref.h>
1616

1717
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__tuple_dir/sfinae_helpers.h renamed to ‎libcxx/include/__tuple/sfinae_helpers.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
#include <__config>
1313
#include <__fwd/tuple.h>
14-
#include <__tuple_dir/make_tuple_types.h>
15-
#include <__tuple_dir/tuple_element.h>
16-
#include <__tuple_dir/tuple_like_ext.h>
17-
#include <__tuple_dir/tuple_size.h>
18-
#include <__tuple_dir/tuple_types.h>
14+
#include <__tuple/make_tuple_types.h>
15+
#include <__tuple/tuple_element.h>
16+
#include <__tuple/tuple_like_ext.h>
17+
#include <__tuple/tuple_size.h>
18+
#include <__tuple/tuple_types.h>
1919
#include <__type_traits/enable_if.h>
2020
#include <__type_traits/integral_constant.h>
2121
#include <__type_traits/is_assignable.h>

‎libcxx/include/__tuple_dir/tuple_element.h renamed to ‎libcxx/include/__tuple/tuple_element.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
1111

1212
#include <__config>
13-
#include <__tuple_dir/tuple_indices.h>
14-
#include <__tuple_dir/tuple_types.h>
13+
#include <__tuple/tuple_indices.h>
14+
#include <__tuple/tuple_types.h>
1515
#include <__type_traits/add_const.h>
1616
#include <__type_traits/add_cv.h>
1717
#include <__type_traits/add_volatile.h>

‎libcxx/include/__tuple_dir/tuple_indices.h renamed to ‎libcxx/include/__tuple/tuple_indices.h

File renamed without changes.

‎libcxx/include/__tuple_dir/tuple_like.h renamed to ‎libcxx/include/__tuple/tuple_like.h

File renamed without changes.

‎libcxx/include/__tuple_dir/tuple_like_ext.h renamed to ‎libcxx/include/__tuple/tuple_like_ext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__fwd/array.h>
1414
#include <__fwd/pair.h>
1515
#include <__fwd/tuple.h>
16-
#include <__tuple_dir/tuple_types.h>
16+
#include <__tuple/tuple_types.h>
1717
#include <__type_traits/integral_constant.h>
1818
#include <cstddef>
1919

‎libcxx/include/__tuple_dir/tuple_size.h renamed to ‎libcxx/include/__tuple/tuple_size.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <__config>
1313
#include <__fwd/tuple.h>
14-
#include <__tuple_dir/tuple_types.h>
14+
#include <__tuple/tuple_types.h>
1515
#include <__type_traits/is_const.h>
1616
#include <__type_traits/is_volatile.h>
1717
#include <cstddef>

‎libcxx/include/__tuple_dir/tuple_types.h renamed to ‎libcxx/include/__tuple/tuple_types.h

File renamed without changes.

‎libcxx/include/__utility/pair.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include <__functional/unwrap_ref.h>
1616
#include <__fwd/get.h>
1717
#include <__fwd/tuple.h>
18-
#include <__tuple_dir/sfinae_helpers.h>
19-
#include <__tuple_dir/tuple_element.h>
20-
#include <__tuple_dir/tuple_indices.h>
21-
#include <__tuple_dir/tuple_size.h>
18+
#include <__tuple/sfinae_helpers.h>
19+
#include <__tuple/tuple_element.h>
20+
#include <__tuple/tuple_indices.h>
21+
#include <__tuple/tuple_size.h>
2222
#include <__type_traits/common_reference.h>
2323
#include <__type_traits/common_type.h>
2424
#include <__type_traits/conditional.h>

‎libcxx/include/array

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
115115
#include <__assert> // all public C++ headers provide the assertion handler
116116
#include <__config>
117117
#include <__iterator/reverse_iterator.h>
118-
#include <__tuple_dir/sfinae_helpers.h>
118+
#include <__tuple/sfinae_helpers.h>
119119
#include <__type_traits/conditional.h>
120120
#include <__type_traits/is_array.h>
121121
#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
146146
#include <initializer_list>
147147

148148
// [tuple.helper]
149-
#include <__tuple_dir/tuple_element.h>
150-
#include <__tuple_dir/tuple_size.h>
149+
#include <__tuple/tuple_element.h>
150+
#include <__tuple/tuple_size.h>
151151

152152
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
153153
# pragma GCC system_header

‎libcxx/include/libcxx.imp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{ include: [ "@<__support/.*>", "private", "<support>", "public" ] },
4343
{ include: [ "@<__system_error/.*>", "private", "<system_error>", "public" ] },
4444
{ include: [ "@<__thread/.*>", "private", "<thread>", "public" ] },
45-
{ include: [ "@<__tuple_dir/.*>", "private", "<tuple>", "public" ] },
45+
{ include: [ "@<__tuple/.*>", "private", "<tuple>", "public" ] },
4646
{ include: [ "@<__type_traits/.*>", "private", "<type_traits>", "public" ] },
4747
{ include: [ "@<__utility/.*>", "private", "<utility>", "public" ] },
4848
{ include: [ "@<__variant/.*>", "private", "<variant>", "public" ] },

‎libcxx/include/module.modulemap.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,18 +1467,18 @@ module std [system] {
14671467
header "tuple"
14681468
export *
14691469

1470-
module apply_cv { private header "__tuple_dir/apply_cv.h" }
1470+
module apply_cv { private header "__tuple/apply_cv.h" }
14711471
module get_fwd { private header "__fwd/get.h" }
1472-
module make_tuple_types { private header "__tuple_dir/make_tuple_types.h" }
1473-
module pair_like { private header "__tuple_dir/pair_like.h" }
1474-
module sfinae_helpers { private header "__tuple_dir/sfinae_helpers.h" }
1475-
module tuple_element { private header "__tuple_dir/tuple_element.h" }
1472+
module make_tuple_types { private header "__tuple/make_tuple_types.h" }
1473+
module pair_like { private header "__tuple/pair_like.h" }
1474+
module sfinae_helpers { private header "__tuple/sfinae_helpers.h" }
1475+
module tuple_element { private header "__tuple/tuple_element.h" }
14761476
module tuple_fwd { private header "__fwd/tuple.h" }
1477-
module tuple_indices { private header "__tuple_dir/tuple_indices.h" }
1478-
module tuple_like { private header "__tuple_dir/tuple_like.h" }
1479-
module tuple_like_ext { private header "__tuple_dir/tuple_like_ext.h" }
1480-
module tuple_size { private header "__tuple_dir/tuple_size.h" }
1481-
module tuple_types { private header "__tuple_dir/tuple_types.h" }
1477+
module tuple_indices { private header "__tuple/tuple_indices.h" }
1478+
module tuple_like { private header "__tuple/tuple_like.h" }
1479+
module tuple_like_ext { private header "__tuple/tuple_like_ext.h" }
1480+
module tuple_size { private header "__tuple/tuple_size.h" }
1481+
module tuple_types { private header "__tuple/tuple_types.h" }
14821482
}
14831483
module type_traits {
14841484
header "type_traits"

‎libcxx/include/optional

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ template<class T>
167167
#include <__functional/unary_function.h>
168168
#include <__memory/addressof.h>
169169
#include <__memory/construct_at.h>
170-
#include <__tuple_dir/sfinae_helpers.h>
170+
#include <__tuple/sfinae_helpers.h>
171171
#include <__type_traits/conjunction.h>
172172
#include <__type_traits/disjunction.h>
173173
#include <__type_traits/is_trivially_copy_assignable.h>

‎libcxx/include/ranges

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ namespace std {
391391
#include <iterator>
392392

393393
// [tuple.helper]
394-
#include <__tuple_dir/tuple_element.h>
395-
#include <__tuple_dir/tuple_size.h>
394+
#include <__tuple/tuple_element.h>
395+
#include <__tuple/tuple_size.h>
396396

397397
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
398398
# pragma GCC system_header

‎libcxx/include/utility

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ template <class T>
272272
#include <initializer_list>
273273

274274
// [tuple.helper]
275-
#include <__tuple_dir/tuple_element.h>
276-
#include <__tuple_dir/tuple_size.h>
275+
#include <__tuple/tuple_element.h>
276+
#include <__tuple/tuple_size.h>
277277

278278
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
279279
# pragma GCC system_header

‎libcxx/test/libcxx/private_headers.verify.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -609,16 +609,16 @@ END-SCRIPT
609609
#include <__system_error/system_error.h> // expected-error@*:* {{use of private header from outside its module: '__system_error/system_error.h'}}
610610
#include <__thread/poll_with_backoff.h> // expected-error@*:* {{use of private header from outside its module: '__thread/poll_with_backoff.h'}}
611611
#include <__thread/timed_backoff_policy.h> // expected-error@*:* {{use of private header from outside its module: '__thread/timed_backoff_policy.h'}}
612-
#include <__tuple_dir/apply_cv.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/apply_cv.h'}}
613-
#include <__tuple_dir/make_tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/make_tuple_types.h'}}
614-
#include <__tuple_dir/pair_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/pair_like.h'}}
615-
#include <__tuple_dir/sfinae_helpers.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/sfinae_helpers.h'}}
616-
#include <__tuple_dir/tuple_element.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_element.h'}}
617-
#include <__tuple_dir/tuple_indices.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_indices.h'}}
618-
#include <__tuple_dir/tuple_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_like.h'}}
619-
#include <__tuple_dir/tuple_like_ext.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_like_ext.h'}}
620-
#include <__tuple_dir/tuple_size.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_size.h'}}
621-
#include <__tuple_dir/tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple_dir/tuple_types.h'}}
612+
#include <__tuple/apply_cv.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/apply_cv.h'}}
613+
#include <__tuple/make_tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/make_tuple_types.h'}}
614+
#include <__tuple/pair_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/pair_like.h'}}
615+
#include <__tuple/sfinae_helpers.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/sfinae_helpers.h'}}
616+
#include <__tuple/tuple_element.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_element.h'}}
617+
#include <__tuple/tuple_indices.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_indices.h'}}
618+
#include <__tuple/tuple_like.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_like.h'}}
619+
#include <__tuple/tuple_like_ext.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_like_ext.h'}}
620+
#include <__tuple/tuple_size.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_size.h'}}
621+
#include <__tuple/tuple_types.h> // expected-error@*:* {{use of private header from outside its module: '__tuple/tuple_types.h'}}
622622
#include <__type_traits/add_const.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_const.h'}}
623623
#include <__type_traits/add_cv.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_cv.h'}}
624624
#include <__type_traits/add_lvalue_reference.h> // expected-error@*:* {{use of private header from outside its module: '__type_traits/add_lvalue_reference.h'}}

‎libcxx/utils/data/ignore_format.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,14 @@ libcxx/include/__thread/poll_with_backoff.h
616616
libcxx/include/__thread/timed_backoff_policy.h
617617
libcxx/include/__tree
618618
libcxx/include/tuple
619-
libcxx/include/__tuple_dir/apply_cv.h
620-
libcxx/include/__tuple_dir/make_tuple_types.h
621-
libcxx/include/__tuple_dir/sfinae_helpers.h
622-
libcxx/include/__tuple_dir/tuple_element.h
623-
libcxx/include/__tuple_dir/tuple_indices.h
624-
libcxx/include/__tuple_dir/tuple_like_ext.h
625-
libcxx/include/__tuple_dir/tuple_size.h
626-
libcxx/include/__tuple_dir/tuple_types.h
619+
libcxx/include/__tuple/apply_cv.h
620+
libcxx/include/__tuple/make_tuple_types.h
621+
libcxx/include/__tuple/sfinae_helpers.h
622+
libcxx/include/__tuple/tuple_element.h
623+
libcxx/include/__tuple/tuple_indices.h
624+
libcxx/include/__tuple/tuple_like_ext.h
625+
libcxx/include/__tuple/tuple_size.h
626+
libcxx/include/__tuple/tuple_types.h
627627
libcxx/include/typeindex
628628
libcxx/include/typeinfo
629629
libcxx/include/__type_traits/add_const.h

‎libcxx/utils/generate_iwyu_mapping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def generate_map(include):
3030
c_headers.append(i.name)
3131

3232
result = []
33-
temporary_mappings = {'__tuple_dir': 'tuple'}
33+
temporary_mappings = {}
3434
for i in detail_directories:
3535
public_header = temporary_mappings.get(i, i.lstrip('_'))
3636
result.append(f'{generate(f"@<{i}/.*>", public_header)},')

0 commit comments

Comments
 (0)