summaryrefslogtreecommitdiff
path: root/libcxx/utils
diff options
context:
space:
mode:
authorNikolas Klauser <nikolasklauser@berlin.de>2023-04-04 13:05:59 +0200
committerNikolas Klauser <nikolasklauser@berlin.de>2023-04-12 14:30:39 +0200
commite2b15ec235fed7e4ff1f99193c7bbffe830d4934 (patch)
treedcd18972af974571872406c0b481531c61542cad /libcxx/utils
parent1a8f3f96c2ff17b1404f4f748abeb9c5f69b6852 (diff)
downloadllvm-e2b15ec235fed7e4ff1f99193c7bbffe830d4934.tar.gz
[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
Diffstat (limited to 'libcxx/utils')
-rw-r--r--libcxx/utils/data/ignore_format.txt16
-rw-r--r--libcxx/utils/generate_iwyu_mapping.py2
2 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index de1834c8e27b..f2d958060c8d 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 c4c502ee4217..16db78df6502 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)},')