intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-27 06:06:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libc++] Rename __tuple_dir back to __tuple

Browse Source 
This essentially reverts D139270

Reviewed By: #libc, EricWF

Spies: tahonermann, libcxx-commits, arichardson

Differential Revision: https://reviews.llvm.org/D147519
This commit is contained in:
Nikolas Klauser
2023-04-04 13:05:59 +02:00
parent 1a8f3f96c2
commit e2b15ec235
26 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libcxx/include/CMakeLists.txt
View File

@@ -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

2
libcxx/include/__functional/hash.h
View File

@@ -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>

2
libcxx/include/__fwd/get.h
View File

@@ -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)

2
libcxx/include/__memory/compressed_pair.h
View File

@@ -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>

6
libcxx/include/__ranges/elements_view.h
View File

@@ -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>

6
libcxx/include/__ranges/subrange.h
View File

@@ -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>

0
libcxx/include/__tuple_dir/apply_cv.h → libcxx/include/__tuple/apply_cv.h
View File

10
libcxx/include/__tuple_dir/make_tuple_types.h → libcxx/include/__tuple/make_tuple_types.h
View File

@@ -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>

4
libcxx/include/__tuple_dir/pair_like.h → libcxx/include/__tuple/pair_like.h
View File

@@ -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)

10
libcxx/include/__tuple_dir/sfinae_helpers.h → libcxx/include/__tuple/sfinae_helpers.h
View File

@@ -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>

4
libcxx/include/__tuple_dir/tuple_element.h → libcxx/include/__tuple/tuple_element.h
View File

@@ -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>

0
libcxx/include/__tuple_dir/tuple_indices.h → libcxx/include/__tuple/tuple_indices.h
View File

0
libcxx/include/__tuple_dir/tuple_like.h → libcxx/include/__tuple/tuple_like.h
View File

2
libcxx/include/__tuple_dir/tuple_like_ext.h → libcxx/include/__tuple/tuple_like_ext.h
View File

@@ -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>

2
libcxx/include/__tuple_dir/tuple_size.h → libcxx/include/__tuple/tuple_size.h
View File

@@ -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>

0
libcxx/include/__tuple_dir/tuple_types.h → libcxx/include/__tuple/tuple_types.h
View File

8
libcxx/include/__utility/pair.h
View File

@@ -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>

6
libcxx/include/array
View File

@@ -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

2
libcxx/include/libcxx.imp
View File

@@ -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" ] },

20
libcxx/include/module.modulemap.in
View File

@@ -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"

2
libcxx/include/optional
View File

@@ -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>

4
libcxx/include/ranges
View File

@@ -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

4
libcxx/include/utility
View File

@@ -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

20
libcxx/test/libcxx/private_headers.verify.cpp
View File

@@ -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'}}

16
libcxx/utils/data/ignore_format.txt
View File

@@ -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

2
libcxx/utils/generate_iwyu_mapping.py
View File

@@ -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)},')