[libcxx-commits] [libcxx] [libc++][modules] Rewrite the modulemap to have fewer top-level modules (PR #107638)

Nikolas Klauser via libcxx-commits libcxx-commits at lists.llvm.org
Sat Sep 7 00:05:03 PDT 2024


================
@@ -1,2111 +1,1609 @@
-// Main C++ standard library interfaces
-module std_algorithm [system] {
-  header "algorithm"
-  export *
-}
-module std_any [system] {
-  header "any"
-  export *
-}
-module std_array [system] {
-  header "array"
-  export *
-}
-module std_atomic [system] {
-  header "atomic"
-  export *
-}
-module std_barrier [system] {
-  header "barrier"
-  export *
-}
-module std_bit [system] {
-  header "bit"
-  export *
-}
-module std_bitset [system] {
-  header "bitset"
-  export *
-}
-module std_charconv [system] {
-  header "charconv"
-  module chars_format            { header "__charconv/chars_format.h" }
-  module from_chars_integral     { header "__charconv/from_chars_integral.h" }
-  module from_chars_result       { header "__charconv/from_chars_result.h" }
-  module tables                  { header "__charconv/tables.h" }
-  module to_chars                { header "__charconv/to_chars.h" }
-  module to_chars_base_10        { header "__charconv/to_chars_base_10.h" }
-  module to_chars_floating_point { header "__charconv/to_chars_floating_point.h" }
-  module to_chars_integral       { header "__charconv/to_chars_integral.h" }
-  module to_chars_result         { header "__charconv/to_chars_result.h" }
-  module traits                  { header "__charconv/traits.h" }
-  export *
-}
-module std_chrono [system] {
-  header "chrono"
-  export *
-}
-module std_codecvt [system] {
-  header "codecvt"
-  export *
-}
-module std_compare [system] {
-  header "compare"
-  export *
-}
-module std_complex [system] {
-  header "complex"
-  export *
-}
-module std_concepts [system] {
-  header "concepts"
-  export *
-}
-module std_condition_variable [system] {
-  header "condition_variable"
-  module condition_variable { header "__condition_variable/condition_variable.h" }
-  export *
-}
-module std_coroutine [system] {
-  header "coroutine"
-  module coroutine_handle      { header "__coroutine/coroutine_handle.h" }
-  module coroutine_traits      { header "__coroutine/coroutine_traits.h" }
-  module noop_coroutine_handle { header "__coroutine/noop_coroutine_handle.h" }
-  module trivial_awaitables    { header "__coroutine/trivial_awaitables.h" }
-  export *
-}
-module std_deque [system] {
-  header "deque"
-  export *
-}
-module std_exception [system] {
-  header "exception"
-  export *
-}
-module std_execution [system] {
-  header "execution"
+// This module contains headers related to the configuration of the library. These headers
+// are free of any dependency on the rest of libc++.
+module std_config [system] {
+  textual header "__config"
+  textual header "__configuration/abi.h"
+  textual header "__configuration/availability.h"
+  textual header "__configuration/compiler.h"
+  textual header "__configuration/language.h"
+  textual header "__configuration/platform.h"
+  textual header "version"
   export *
 }
-module std_expected [system] {
-  header "expected"
+
+module std_core [system] {
+  module cstddef {
+    header "__cstddef/byte.h"
+    header "__cstddef/max_align_t.h"
+    header "__cstddef/nullptr_t.h"
+    header "__cstddef/ptrdiff_t.h"
+    header "__cstddef/size_t.h"
+    export *
+  }
+
+  module cstdint {
+    header "cstdint"
+    export *
+  }
+
+  module fwd {
+    header "__fwd/byte.h"
+    header "__fwd/functional.h"
+    header "__fwd/pair.h"
+    header "__fwd/tuple.h"
+    export *
+  }
+
+  module limits {
+    header "limits"
+    export *
+  }
+
+  module math {
+    header "__math/abs.h"
+    header "__math/copysign.h"
+    header "__math/error_functions.h"
+    header "__math/exponential_functions.h"
+    header "__math/fdim.h"
+    header "__math/fma.h"
+    header "__math/gamma.h"
+    header "__math/hyperbolic_functions.h"
+    header "__math/hypot.h"
+    header "__math/inverse_hyperbolic_functions.h"
+    header "__math/inverse_trigonometric_functions.h"
+    header "__math/logarithms.h"
+    header "__math/min_max.h"
+    header "__math/modulo.h"
+    header "__math/remainder.h"
+    header "__math/roots.h"
+    header "__math/rounding_functions.h"
+    header "__math/special_functions.h"
+    header "__math/traits.h"
+    header "__math/trigonometric_functions.h"
+    export *
+  }
+
+  module type_traits {
+    header "type_traits"
+    header "__type_traits/add_const.h"
+    header "__type_traits/add_cv.h"
+    header "__type_traits/add_lvalue_reference.h"
+    header "__type_traits/add_pointer.h"
+    header "__type_traits/add_rvalue_reference.h"
+    header "__type_traits/add_volatile.h"
+    header "__type_traits/aligned_storage.h"
+    header "__type_traits/aligned_union.h"
+    header "__type_traits/alignment_of.h"
+    header "__type_traits/can_extract_key.h"
+    header "__type_traits/common_reference.h"
+    header "__type_traits/common_type.h"
+    header "__type_traits/conditional.h"
+    header "__type_traits/conjunction.h"
+    header "__type_traits/copy_cv.h"
+    header "__type_traits/copy_cvref.h"
+    header "__type_traits/datasizeof.h"
+    header "__type_traits/decay.h"
+    header "__type_traits/dependent_type.h"
+    header "__type_traits/desugars_to.h"
+    header "__type_traits/disjunction.h"
+    header "__type_traits/enable_if.h"
+    header "__type_traits/extent.h"
+    header "__type_traits/has_unique_object_representation.h"
+    header "__type_traits/has_virtual_destructor.h"
+    header "__type_traits/integral_constant.h"
+    header "__type_traits/invoke.h"
+    header "__type_traits/is_abstract.h"
+    header "__type_traits/is_aggregate.h"
+    header "__type_traits/is_allocator.h"
+    header "__type_traits/is_always_bitcastable.h"
+    header "__type_traits/is_arithmetic.h"
+    header "__type_traits/is_array.h"
+    header "__type_traits/is_assignable.h"
+    header "__type_traits/is_base_of.h"
+    header "__type_traits/is_bounded_array.h"
+    header "__type_traits/is_callable.h"
+    header "__type_traits/is_char_like_type.h"
+    header "__type_traits/is_class.h"
+    header "__type_traits/is_compound.h"
+    header "__type_traits/is_const.h"
+    header "__type_traits/is_constant_evaluated.h"
+    header "__type_traits/is_constructible.h"
+    header "__type_traits/is_convertible.h"
+    header "__type_traits/is_core_convertible.h"
+    header "__type_traits/is_destructible.h"
+    header "__type_traits/is_empty.h"
+    header "__type_traits/is_enum.h"
+    header "__type_traits/is_equality_comparable.h"
+    header "__type_traits/is_execution_policy.h"
+    header "__type_traits/is_final.h"
+    header "__type_traits/is_floating_point.h"
+    header "__type_traits/is_function.h"
+    header "__type_traits/is_fundamental.h"
+    header "__type_traits/is_implicitly_default_constructible.h"
+    header "__type_traits/is_integral.h"
+    header "__type_traits/is_literal_type.h"
+    header "__type_traits/is_member_pointer.h"
+    header "__type_traits/is_nothrow_assignable.h"
+    header "__type_traits/is_nothrow_constructible.h"
+    header "__type_traits/is_nothrow_convertible.h"
+    header "__type_traits/is_nothrow_destructible.h"
+    header "__type_traits/is_null_pointer.h"
+    header "__type_traits/is_object.h"
+    header "__type_traits/is_pod.h"
+    header "__type_traits/is_pointer.h"
+    header "__type_traits/is_polymorphic.h"
+    header "__type_traits/is_primary_template.h"
+    header "__type_traits/is_reference_wrapper.h"
+    header "__type_traits/is_reference.h"
+    header "__type_traits/is_referenceable.h"
+    header "__type_traits/is_same.h"
+    header "__type_traits/is_scalar.h"
+    header "__type_traits/is_signed_integer.h"
+    header "__type_traits/is_signed.h"
+    header "__type_traits/is_specialization.h"
+    header "__type_traits/is_standard_layout.h"
+    header "__type_traits/is_swappable.h"
+    header "__type_traits/is_trivial.h"
+    header "__type_traits/is_trivially_assignable.h"
+    header "__type_traits/is_trivially_constructible.h"
+    header "__type_traits/is_trivially_copyable.h"
+    header "__type_traits/is_trivially_destructible.h"
+    header "__type_traits/is_trivially_lexicographically_comparable.h"
+    header "__type_traits/is_trivially_relocatable.h"
+    header "__type_traits/is_unbounded_array.h"
+    header "__type_traits/is_union.h"
+    header "__type_traits/is_unsigned_integer.h"
+    header "__type_traits/is_unsigned.h"
+    header "__type_traits/is_valid_expansion.h"
+    header "__type_traits/is_void.h"
+    header "__type_traits/is_volatile.h"
+    header "__type_traits/lazy.h"
+    header "__type_traits/make_32_64_or_128_bit.h"
+    header "__type_traits/make_const_lvalue_ref.h"
+    header "__type_traits/make_signed.h"
+    header "__type_traits/make_unsigned.h"
+    header "__type_traits/maybe_const.h"
+    header "__type_traits/nat.h"
+    header "__type_traits/negation.h"
+    header "__type_traits/promote.h"
+    header "__type_traits/rank.h"
+    header "__type_traits/remove_all_extents.h"
+    header "__type_traits/remove_const_ref.h"
+    header "__type_traits/remove_const.h"
+    header "__type_traits/remove_cv.h"
+    header "__type_traits/remove_cvref.h"
+    header "__type_traits/remove_extent.h"
+    header "__type_traits/remove_pointer.h"
+    header "__type_traits/remove_reference.h"
+    header "__type_traits/remove_volatile.h"
+    header "__type_traits/result_of.h"
+    header "__type_traits/strip_signature.h"
+    header "__type_traits/type_identity.h"
+    header "__type_traits/type_list.h"
+    header "__type_traits/underlying_type.h"
+    header "__type_traits/unwrap_ref.h"
+    header "__type_traits/void_t.h"
+    export *
+  } // module type_traits
+
+  // Only the truly dependency-free parts of __utility are here
+  module utility {
+    header "__utility/declval.h"
+    header "__utility/forward.h"
+    export *
+  }
+
   export *
-}
-module std_filesystem [system] {
-  header "filesystem"
-  module copy_options                 { header "__filesystem/copy_options.h" }
-  module directory_entry              { header "__filesystem/directory_entry.h" }
-  module directory_iterator           { header "__filesystem/directory_iterator.h" }
-  module directory_options            { header "__filesystem/directory_options.h" }
-  module file_status                  { header "__filesystem/file_status.h" }
-  module file_time_type               { header "__filesystem/file_time_type.h" }
-  module file_type                    { header "__filesystem/file_type.h" }
-  module filesystem_error             {
-    header "__filesystem/filesystem_error.h"
-    export std_private_memory_shared_ptr
+} // module std_core
+
+module std [system] {
+  module algorithm {
+    header "algorithm"
+    header "__algorithm/adjacent_find.h"
+    header "__algorithm/all_of.h"
+    header "__algorithm/any_of.h"
+    header "__algorithm/binary_search.h"
+    header "__algorithm/clamp.h"
+    header "__algorithm/comp_ref_type.h"
+    header "__algorithm/comp.h"
+    header "__algorithm/copy_backward.h"
+    header "__algorithm/copy_if.h"
+    header "__algorithm/copy_move_common.h"
+    header "__algorithm/copy_n.h"
+    header "__algorithm/copy.h"
+    header "__algorithm/count_if.h"
+    header "__algorithm/count.h"
+    header "__algorithm/equal_range.h"
+    header "__algorithm/equal.h"
+    header "__algorithm/fill_n.h"
+    header "__algorithm/fill.h"
+    header "__algorithm/find_end.h"
+    header "__algorithm/find_first_of.h"
+    header "__algorithm/find_if_not.h"
+    header "__algorithm/find_if.h"
+    header "__algorithm/find_segment_if.h"
+    header "__algorithm/find.h"
+    header "__algorithm/fold.h"
+    header "__algorithm/for_each_n.h"
+    header "__algorithm/for_each_segment.h"
+    header "__algorithm/for_each.h"
+    header "__algorithm/generate_n.h"
+    header "__algorithm/generate.h"
+    header "__algorithm/half_positive.h"
+    header "__algorithm/in_found_result.h"
+    header "__algorithm/in_fun_result.h"
+    header "__algorithm/in_in_out_result.h"
+    header "__algorithm/in_in_result.h"
+    header "__algorithm/in_out_out_result.h"
+    header "__algorithm/in_out_result.h"
+    header "__algorithm/includes.h"
+    header "__algorithm/inplace_merge.h"
+    header "__algorithm/is_heap_until.h"
+    header "__algorithm/is_heap.h"
+    header "__algorithm/is_partitioned.h"
+    header "__algorithm/is_permutation.h"
+    header "__algorithm/is_sorted_until.h"
+    header "__algorithm/is_sorted.h"
+    header "__algorithm/iter_swap.h"
+    header "__algorithm/iterator_operations.h"
+    header "__algorithm/lexicographical_compare_three_way.h"
+    header "__algorithm/lexicographical_compare.h"
+    header "__algorithm/lower_bound.h"
+    header "__algorithm/make_heap.h"
+    header "__algorithm/make_projected.h"
+    header "__algorithm/max_element.h"
+    header "__algorithm/max.h"
+    header "__algorithm/merge.h"
+    header "__algorithm/min_element.h"
+    header "__algorithm/min_max_result.h"
+    header "__algorithm/min.h"
+    header "__algorithm/minmax_element.h"
+    header "__algorithm/minmax.h"
+    header "__algorithm/mismatch.h"
+    header "__algorithm/move_backward.h"
+    header "__algorithm/move.h"
+    header "__algorithm/next_permutation.h"
+    header "__algorithm/none_of.h"
+    header "__algorithm/nth_element.h"
+    header "__algorithm/partial_sort_copy.h"
+    header "__algorithm/partial_sort.h"
+    header "__algorithm/partition_copy.h"
+    header "__algorithm/partition_point.h"
+    header "__algorithm/partition.h"
+    header "__algorithm/pop_heap.h"
+    header "__algorithm/prev_permutation.h"
+    header "__algorithm/pstl.h"
+    header "__algorithm/push_heap.h"
+    header "__algorithm/ranges_adjacent_find.h"
+    header "__algorithm/ranges_all_of.h"
+    header "__algorithm/ranges_any_of.h"
+    header "__algorithm/ranges_binary_search.h"
+    header "__algorithm/ranges_clamp.h"
+    header "__algorithm/ranges_contains_subrange.h"
+    header "__algorithm/ranges_contains.h"
+    header "__algorithm/ranges_copy_backward.h"
+    header "__algorithm/ranges_copy_if.h"
+    header "__algorithm/ranges_copy_n.h"
+    header "__algorithm/ranges_copy.h"
+    header "__algorithm/ranges_count_if.h"
+    header "__algorithm/ranges_count.h"
+    header "__algorithm/ranges_ends_with.h"
+    header "__algorithm/ranges_equal_range.h"
+    header "__algorithm/ranges_equal.h"
+    header "__algorithm/ranges_fill_n.h"
+    header "__algorithm/ranges_fill.h"
+    header "__algorithm/ranges_find_end.h"
+    header "__algorithm/ranges_find_first_of.h"
+    header "__algorithm/ranges_find_if_not.h"
+    header "__algorithm/ranges_find_if.h"
+    header "__algorithm/ranges_find_last.h"
+    header "__algorithm/ranges_find.h"
+    header "__algorithm/ranges_for_each_n.h"
+    header "__algorithm/ranges_for_each.h"
+    header "__algorithm/ranges_generate_n.h"
+    header "__algorithm/ranges_generate.h"
+    header "__algorithm/ranges_includes.h"
+    header "__algorithm/ranges_inplace_merge.h"
+    header "__algorithm/ranges_is_heap_until.h"
+    header "__algorithm/ranges_is_heap.h"
+    header "__algorithm/ranges_is_partitioned.h"
+    header "__algorithm/ranges_is_permutation.h"
+    header "__algorithm/ranges_is_sorted_until.h"
+    header "__algorithm/ranges_is_sorted.h"
+    header "__algorithm/ranges_iterator_concept.h"
+    header "__algorithm/ranges_lexicographical_compare.h"
+    header "__algorithm/ranges_lower_bound.h"
+    header "__algorithm/ranges_make_heap.h"
+    header "__algorithm/ranges_max_element.h"
+    header "__algorithm/ranges_max.h"
+    header "__algorithm/ranges_merge.h"
+    header "__algorithm/ranges_min_element.h"
+    header "__algorithm/ranges_min.h"
+    header "__algorithm/ranges_minmax_element.h"
+    header "__algorithm/ranges_minmax.h"
+    header "__algorithm/ranges_mismatch.h"
+    header "__algorithm/ranges_move_backward.h"
+    header "__algorithm/ranges_move.h"
+    header "__algorithm/ranges_next_permutation.h"
+    header "__algorithm/ranges_none_of.h"
+    header "__algorithm/ranges_nth_element.h"
+    header "__algorithm/ranges_partial_sort_copy.h"
+    header "__algorithm/ranges_partial_sort.h"
+    header "__algorithm/ranges_partition_copy.h"
+    header "__algorithm/ranges_partition_point.h"
+    header "__algorithm/ranges_partition.h"
+    header "__algorithm/ranges_pop_heap.h"
+    header "__algorithm/ranges_prev_permutation.h"
+    header "__algorithm/ranges_push_heap.h"
+    header "__algorithm/ranges_remove_copy_if.h"
+    header "__algorithm/ranges_remove_copy.h"
+    header "__algorithm/ranges_remove_if.h"
+    header "__algorithm/ranges_remove.h"
+    header "__algorithm/ranges_replace_copy_if.h"
+    header "__algorithm/ranges_replace_copy.h"
+    header "__algorithm/ranges_replace_if.h"
+    header "__algorithm/ranges_replace.h"
+    header "__algorithm/ranges_reverse_copy.h"
+    header "__algorithm/ranges_reverse.h"
+    header "__algorithm/ranges_rotate_copy.h"
+    header "__algorithm/ranges_rotate.h"
+    header "__algorithm/ranges_sample.h"
+    header "__algorithm/ranges_search_n.h"
+    header "__algorithm/ranges_search.h"
+    header "__algorithm/ranges_set_difference.h"
+    header "__algorithm/ranges_set_intersection.h"
+    header "__algorithm/ranges_set_symmetric_difference.h"
+    header "__algorithm/ranges_set_union.h"
+    header "__algorithm/ranges_shuffle.h"
+    header "__algorithm/ranges_sort_heap.h"
+    header "__algorithm/ranges_sort.h"
+    header "__algorithm/ranges_stable_partition.h"
+    header "__algorithm/ranges_stable_sort.h"
+    header "__algorithm/ranges_starts_with.h"
+    header "__algorithm/ranges_swap_ranges.h"
+    header "__algorithm/ranges_transform.h"
+    header "__algorithm/ranges_unique_copy.h"
+    header "__algorithm/ranges_unique.h"
+    header "__algorithm/ranges_upper_bound.h"
+    header "__algorithm/remove_copy_if.h"
+    header "__algorithm/remove_copy.h"
+    header "__algorithm/remove_if.h"
+    header "__algorithm/remove.h"
+    header "__algorithm/replace_copy_if.h"
+    header "__algorithm/replace_copy.h"
+    header "__algorithm/replace_if.h"
+    header "__algorithm/replace.h"
+    header "__algorithm/reverse_copy.h"
+    header "__algorithm/reverse.h"
+    header "__algorithm/rotate_copy.h"
+    header "__algorithm/rotate.h"
+    header "__algorithm/sample.h"
+    header "__algorithm/search_n.h"
+    header "__algorithm/search.h"
+    header "__algorithm/set_difference.h"
+    header "__algorithm/set_intersection.h"
+    header "__algorithm/set_symmetric_difference.h"
+    header "__algorithm/set_union.h"
+    header "__algorithm/shift_left.h"
+    header "__algorithm/shift_right.h"
+    header "__algorithm/shuffle.h"
+    header "__algorithm/sift_down.h"
+    header "__algorithm/simd_utils.h"
+    header "__algorithm/sort_heap.h"
+    header "__algorithm/sort.h"
+    header "__algorithm/stable_partition.h"
+    header "__algorithm/stable_sort.h"
+    header "__algorithm/swap_ranges.h"
+    header "__algorithm/three_way_comp_ref_type.h"
+    header "__algorithm/transform.h"
+    header "__algorithm/uniform_random_bit_generator_adaptor.h"
+    header "__algorithm/unique_copy.h"
+    header "__algorithm/unique.h"
+    header "__algorithm/unwrap_iter.h"
+    header "__algorithm/unwrap_range.h"
+    header "__algorithm/upper_bound.h"
+
+    export debug_utils.strict_weak_ordering_check
+    export functional.ranges_operations
+    export iterator.aliasing_iterator
+    export iterator.iterator_traits
+    export type_traits.is_trivially_copyable
+    export utility.pair
+    export *
+  } // module algorithm
+
+  module any {
+    header "any"
+    export *
+  }
+
+  module array {
+    header "array"
+    header "__fwd/array.h"
+    export *
+  }
+
+  module atomic {
+    header "atomic"
+    header "__atomic/aliases.h"
+    header "__atomic/atomic_base.h"
+    header "__atomic/atomic_flag.h"
+    header "__atomic/atomic_init.h"
+    header "__atomic/atomic_lock_free.h"
+    header "__atomic/atomic_ref.h"
+    header "__atomic/atomic_sync.h"
+    header "__atomic/atomic.h"
+    header "__atomic/check_memory_order.h"
+    header "__atomic/contention_t.h"
+    header "__atomic/cxx_atomic_impl.h"
+    header "__atomic/fence.h"
+    header "__atomic/is_always_lock_free.h"
+    header "__atomic/kill_dependency.h"
+    header "__atomic/memory_order.h"
+    header "__atomic/to_gcc_order.h"
+    export *
+  }
+
+  module barrier {
+    header "barrier"
+    export *
+  }
+
+  module bit {
+    header "bit"
+    header "__bit/bit_cast.h"
+    header "__bit/bit_ceil.h"
+    header "__bit/bit_floor.h"
+    header "__bit/bit_log2.h"
+    header "__bit/bit_width.h"
+    header "__bit/blsr.h"
+    header "__bit/byteswap.h"
+    header "__bit/countl.h"
+    header "__bit/countr.h"
+    header "__bit/endian.h"
+    header "__bit/has_single_bit.h"
+    header "__bit/invert_if.h"
+    header "__bit/popcount.h"
+    header "__bit/rotate.h"
+    export *
+  }
+
+  module bitset {
+    header "bitset"
+    export *
+  }
+
+  module charconv {
+    header "charconv"
+    header "__charconv/chars_format.h"
+    header "__charconv/from_chars_integral.h"
+    header "__charconv/from_chars_result.h"
+    header "__charconv/tables.h"
+    header "__charconv/to_chars.h"
+    header "__charconv/to_chars_base_10.h"
+    header "__charconv/to_chars_floating_point.h"
+    header "__charconv/to_chars_integral.h"
+    header "__charconv/to_chars_result.h"
+    header "__charconv/traits.h"
+    export *
+  }
+
+  module chrono {
+    header "chrono"
+    header "__chrono/calendar.h"
+    header "__chrono/concepts.h"
+    header "__chrono/convert_to_timespec.h"
+    header "__chrono/convert_to_tm.h"
+    header "__chrono/day.h"
+    header "__chrono/duration.h"
+    header "__chrono/exception.h"
+    header "__chrono/file_clock.h"
+    header "__chrono/formatter.h"
+    header "__chrono/hh_mm_ss.h"
+    header "__chrono/high_resolution_clock.h"
+    header "__chrono/leap_second.h"
+    header "__chrono/literals.h"
+    header "__chrono/local_info.h"
+    header "__chrono/month_weekday.h"
+    header "__chrono/month.h"
+    header "__chrono/monthday.h"
+    header "__chrono/ostream.h"
+    header "__chrono/parser_std_format_spec.h"
+    header "__chrono/statically_widen.h"
+    header "__chrono/steady_clock.h"
+    header "__chrono/sys_info.h"
+    header "__chrono/system_clock.h"
+    header "__chrono/time_point.h"
+    header "__chrono/time_zone_link.h"
+    header "__chrono/time_zone.h"
+    header "__chrono/tzdb_list.h"
+    header "__chrono/tzdb.h"
+    header "__chrono/weekday.h"
+    header "__chrono/year_month_day.h"
+    header "__chrono/year_month_weekday.h"
+    header "__chrono/year_month.h"
+    header "__chrono/year.h"
+    header "__chrono/zoned_time.h"
+
+    export memory.unique_ptr
+    export *
+  } // module chrono
+
+  module codecvt {
+    header "codecvt"
+    export *
+  }
+
+  module compare {
+    header "compare"
+    header "__compare/common_comparison_category.h"
+    header "__compare/compare_partial_order_fallback.h"
+    header "__compare/compare_strong_order_fallback.h"
+    header "__compare/compare_three_way.h"
+    header "__compare/compare_three_way_result.h"
+    header "__compare/compare_weak_order_fallback.h"
+    header "__compare/is_eq.h"
+    header "__compare/ordering.h"
+    header "__compare/partial_order.h"
+    header "__compare/strong_order.h"
+    header "__compare/synth_three_way.h"
+    header "__compare/three_way_comparable.h"
+    header "__compare/weak_order.h"
+    export *
+  }
+
+  module complex {
+    header "complex"
+    header "__fwd/complex.h"
+    export *
+  }
+
+  module concepts {
+    header "concepts"
+    header "__concepts/arithmetic.h"
+    header "__concepts/assignable.h"
+    header "__concepts/boolean_testable.h"
+    header "__concepts/class_or_enum.h"
+    header "__concepts/common_reference_with.h"
+    header "__concepts/common_with.h"
+    header "__concepts/constructible.h"
+    header "__concepts/convertible_to.h"
+    header "__concepts/copyable.h"
+    header "__concepts/derived_from.h"
+    header "__concepts/destructible.h"
+    header "__concepts/different_from.h"
+    header "__concepts/equality_comparable.h"
+    header "__concepts/invocable.h"
+    header "__concepts/movable.h"
+    header "__concepts/predicate.h"
+    header "__concepts/regular.h"
+    header "__concepts/relation.h"
+    header "__concepts/same_as.h"
+    header "__concepts/semiregular.h"
+    header "__concepts/swappable.h"
+    header "__concepts/totally_ordered.h"
+
+    export concepts.destructible
+    export type_traits.common_reference
+    export type_traits.is_nothrow_destructible
+    export type_traits.is_object
+    export type_traits.is_same
+    export *
+  }
+
+  module condition_variable {
+    header "condition_variable"
+    header "__condition_variable/condition_variable.h"
+    export *
+  }
+
+  module cassert {
+    textual header "cassert" // NDEBUG requires textual inclusion
+    export *
+  }
+
+  module ccomplex {
+    header "ccomplex"
+    export *
+  }
+
+  module cctype {
+    header "cctype"
+    export *
+  }
+
+  module cerrno {
+    header "cerrno"
+    export *
+  }
+
+  module cfenv {
+    header "cfenv"
+    export *
+  }
+
+  module cfloat {
+    header "cfloat"
+    export *
+  }
+
+  module cinttypes {
+    header "cinttypes"
+    export *
+  }
+
+  module ciso646 {
+    header "ciso646"
+    export *
+  }
+
+  module climits {
+    header "climits"
+    export *
+  }
+
+  module clocale {
+    header "clocale"
+    export *
+  }
+
+  module cmath {
+    header "cmath"
+    export *
+  }
+
+  module csetjmp {
+    header "csetjmp"
+    export *
+  }
+
+  module csignal {
+    header "csignal"
+    export *
+  }
+
+  module cstdarg {
+    header "cstdarg"
+    export *
+  }
+
+  module cstdbool {
+    header "cstdbool"
+    export *
+  }
+
+  module cstddef {
+    header "cstddef"
+    export *
+  }
+
+  module cstdio {
+    header "cstdio"
+    export *
+  }
+
+  module cstdlib {
+    header "cstdlib"
+    export *
+  }
+
+  module cstring {
+    header "cstring"
+    export *
+  }
+
+  module ctgmath {
+    header "ctgmath"
+    export *
+  }
+
+  module ctime {
+    header "ctime"
+    export *
+  }
+
+  module cuchar {
+    header "cuchar"
+    export *
+  }
+
+  module cwchar {
+    header "cwchar"
+    export *
+  }
+
+  module cwctype {
+    header "cwctype"
+    export *
+  }
+
+  module deque {
+    header "deque"
+    header "__fwd/deque.h"
+    export *
+  }
+
+  module exception {
+    header "exception"
+    header "__exception/exception.h"
+    header "__exception/exception_ptr.h"
+    header "__exception/nested_exception.h"
+    header "__exception/operations.h"
+    header "__exception/terminate.h"
+    export *
+  }
+
+  module execution {
+    header "execution"
+    export *
+  }
+
+  module expected {
+    header "expected"
+    header "__expected/bad_expected_access.h"
+    header "__expected/expected.h"
+    header "__expected/unexpect.h"
+    header "__expected/unexpected.h"
+    export *
   }
-  module operations                   { header "__filesystem/operations.h" }
-  module path                         {
+
+  module filesystem {
+    header "filesystem"
+    header "__filesystem/copy_options.h"
+    header "__filesystem/directory_entry.h"
+    header "__filesystem/directory_iterator.h"
+    header "__filesystem/directory_options.h"
+    header "__filesystem/file_status.h"
+    header "__filesystem/file_time_type.h"
+    header "__filesystem/file_type.h"
+    header "__filesystem/filesystem_error.h"
+    header "__filesystem/operations.h"
+    header "__filesystem/path_iterator.h"
     header "__filesystem/path.h"
-    export std_string // returned by various methods
-  }
-  module path_iterator                { header "__filesystem/path_iterator.h" }
-  module perm_options                 { header "__filesystem/perm_options.h" }
-  module perms                        { header "__filesystem/perms.h" }
-  module recursive_directory_iterator { header "__filesystem/recursive_directory_iterator.h" }
-  module space_info                   { header "__filesystem/space_info.h" }
-  module u8path                       { header "__filesystem/u8path.h" }
-  export *
-}
-module std_format [system] {
-  header "format"
-  export *
-}
-module std_forward_list [system] {
-  header "forward_list"
-  export *
-}
-module std_fstream [system] {
-  header "fstream"
-  export *
-}
-module std_functional [system] {
-  header "functional"
-  export *
-}
-module std_future [system] {
-  header "future"
-  export *
-}
-module std_initializer_list [system] {
-  header "initializer_list"
-  export *
-}
-module std_iomanip [system] {
-  header "iomanip"
-  export *
-}
-module std_ios [system] {
-  header "ios"
-  export *
-}
-module std_iosfwd [system] {
-  header "iosfwd"
-  export *
-}
-module std_iostream [system] {
-  header "iostream"
-  export *
-}
-module std_istream [system] {
-  header "istream"
-  export *
-}
-module std_iterator [system] {
-  header "iterator"
-  export *
-}
-module std_latch [system] {
-  header "latch"
-  export *
-}
-module std_limits [system] {
-  header "limits"
-  export *
-}
-module std_list [system] {
-  header "list"
-  export *
-}
-module std_locale [system] {
-  header "locale"
-  export *
-}
-module std_map [system] {
-  header "map"
-  export *
-}
-module std_mdspan [system] {
-  header "mdspan"
-  module default_accessor { header "__mdspan/default_accessor.h" }
-  module extents          { header "__mdspan/extents.h" }
-  module fwd              { header "__fwd/mdspan.h" }
-  module layout_left      { header "__mdspan/layout_left.h" }
-  module layout_right     { header "__mdspan/layout_right.h" }
-  module layout_stride    { header "__mdspan/layout_stride.h" }
-  module mdspan           {
-    header "__mdspan/mdspan.h"
-    export std_array // for strides()
+    header "__filesystem/perm_options.h"
+    header "__filesystem/perms.h"
+    header "__filesystem/recursive_directory_iterator.h"
+    header "__filesystem/space_info.h"
+    header "__filesystem/u8path.h"
+
+    export std_string // returned by various methods of filesystem::path
+    export memory.shared_ptr
+    export *
   }
-  export *
-}
-module std_memory [system] {
-  header "memory"
-  export *
-}
-module std_memory_resource [system] {
-  header "memory_resource"
-  export *
-}
-module std_mutex [system] {
-  header "mutex"
-  export *
-}
-module std_new [system] {
-  header "new"
-  export *
-}
-module std_numbers [system] {
-  header "numbers"
-  export *
-}
-module std_numeric [system] {
-  header "numeric"
-  export *
-}
-module std_optional [system] {
-  header "optional"
-  export *
-}
-module std_ostream [system] {
-  header "ostream"
-  export *
-}
-module std_print [system] {
-  header "print"
-  export *
-}
-module std_queue [system] {
-  header "queue"
-  export *
-}
-module std_random [system] {
-  header "random"
-  export *
-}
-module std_ranges [system] {
-  header "ranges"
-  export *
-}
-module std_ratio [system] {
-  header "ratio"
-  export *
-}
-module std_regex [system] {
-  header "regex"
-  export *
-}
-module std_scoped_allocator [system] {
-  header "scoped_allocator"
-  export *
-}
-module std_semaphore [system] {
-  header "semaphore"
-  export *
-}
-module std_set [system] {
-  header "set"
-  export *
-}
-module std_shared_mutex [system] {
-  header "shared_mutex"
-  export std_version
-}
-module std_source_location [system] {
-  header "source_location"
-  export *
-}
-module std_span [system] {
-  header "span"
-  export std_private_ranges_enable_borrowed_range
-  export std_version
-  export std_private_span_span_fwd
-}
-module std_sstream [system] {
-  header "sstream"
-  export *
-}
-module std_stack [system] {
-  header "stack"
-  export *
-}
-module std_stdexcept [system] {
-  header "stdexcept"
-  export *
-}
-module std_stop_token [system] {
-  header "stop_token"
-  private header "__stop_token/atomic_unique_lock.h"
-  private header "__stop_token/intrusive_list_view.h"
-  private header "__stop_token/intrusive_shared_ptr.h"
-  private header "__stop_token/stop_callback.h"
-  private header "__stop_token/stop_source.h"
-  private header "__stop_token/stop_state.h"
-  private header "__stop_token/stop_token.h"
-  export *
-}
-module std_streambuf [system] {
-  header "streambuf"
-  export *
-}
-module std_string [system] {
-  header "string"
-  export *
-}
-module std_string_view [system] {
-  header "string_view"
-  export *
-}
-module std_strstream [system] {
-  header "strstream"
-  export *
-}
-module std_syncstream [system] {
-  header "syncstream"
-  export *
-}
-module std_system_error [system] {
-  header "system_error"
-  export *
-}
-module std_thread [system] {
-  header "thread"
-  export *
-}
-module std_tuple [system] {
-  header "tuple"
-  export *
-}
-module std_type_traits [system] {
-  header "type_traits"
-  export *
-}
-module std_typeindex [system] {
-  header "typeindex"
-  export *
-}
-module std_typeinfo [system] {
-  header "typeinfo"
-  export *
-}
-module std_unordered_map [system] {
-  header "unordered_map"
-  export *
-}
-module std_unordered_set [system] {
-  header "unordered_set"
-  export *
-}
-module std_utility [system] {
-  header "utility"
-  export *
-}
-module std_valarray [system] {
-  header "valarray"
-  export *
-}
-module std_variant [system] {
-  header "variant"
-  export *
-}
-module std_vector [system] {
-  header "vector"
-  export *
-}
-module std_version [system] {
-  header "version"
-  export *
-}
 
-// C standard library interface wrappers
-module std_cassert [system] {
-  // <cassert>'s use of NDEBUG requires textual inclusion.
-  textual header "cassert"
-}
-module std_ccomplex [system] {
-  header "ccomplex"
-  export *
-}
-module std_cctype [system] {
-  header "cctype"
-  export *
-}
-module std_cerrno [system] {
-  header "cerrno"
-  export *
-}
-module std_cfenv [system] {
-  header "cfenv"
-  export *
-}
-module std_cfloat [system] {
-  header "cfloat"
-  export *
-}
-module std_cinttypes [system] {
-  header "cinttypes"
-  export *
-}
-module std_ciso646 [system] {
-  header "ciso646"
-  export *
-}
-module std_climits [system] {
-  header "climits"
-  export *
-}
-module std_clocale [system] {
-  header "clocale"
-  export *
-}
-module std_cmath [system] {
-  header "cmath"
-  export *
-}
-module std_csetjmp [system] {
-  header "csetjmp"
-  export *
-}
-module std_csignal [system] {
-  header "csignal"
-  export *
-}
-// FIXME: <cstdalign> is missing.
-module std_cstdarg [system] {
-  header "cstdarg"
-  export *
-}
-module std_cstdbool [system] {
-  header "cstdbool"
-  export *
-}
-module std_cstddef [system] {
-  header "cstddef"
-  module byte         { header "__cstddef/byte.h" }
-  module max_align_t  { header "__cstddef/max_align_t.h" }
-  module nullptr_t    { header "__cstddef/nullptr_t.h" }
-  module ptrdiff_t    { header "__cstddef/ptrdiff_t.h" }
-  module size_t       { header "__cstddef/size_t.h" }
-  export *
-}
-module std_cstdint [system] {
-  header "cstdint"
-  export *
-}
-module std_cstdio [system] {
-  header "cstdio"
-  export *
-}
-module std_cstdlib [system] {
-  header "cstdlib"
-  export *
-}
-module std_cstring [system] {
-  header "cstring"
-  export *
-}
-module std_ctgmath [system] {
-  header "ctgmath"
-  export *
-}
-module std_ctime [system] {
-  header "ctime"
-  export *
-}
-module std_cuchar [system] {
-  header "cuchar"
-  export *
-}
-module std_cwchar [system] {
-  header "cwchar"
-  export *
-}
-module std_cwctype [system] {
-  header "cwctype"
-  export *
-}
+  module format {
+    header "format"
+    header "__format/buffer.h"
+    header "__format/concepts.h"
+    header "__format/container_adaptor.h"
+    header "__format/enable_insertable.h"
+    header "__format/escaped_output_table.h"
+    header "__format/extended_grapheme_cluster_table.h"
+    header "__format/format_arg_store.h"
+    header "__format/format_arg.h"
+    header "__format/format_args.h"
+    header "__format/format_context.h"
+    header "__format/format_error.h"
+    header "__format/format_functions.h"
+    header "__format/format_parse_context.h"
+    header "__format/format_string.h"
+    header "__format/format_to_n_result.h"
+    header "__format/formatter_bool.h"
+    header "__format/formatter_char.h"
+    header "__format/formatter_floating_point.h"
+    header "__format/formatter_integer.h"
+    header "__format/formatter_integral.h"
+    header "__format/formatter_output.h"
+    header "__format/formatter_pointer.h"
+    header "__format/formatter_string.h"
+    header "__format/formatter_tuple.h"
+    header "__format/formatter.h"
+    header "__format/indic_conjunct_break_table.h"
+    header "__format/parser_std_format_spec.h"
+    header "__format/range_default_formatter.h"
+    header "__format/range_formatter.h"
+    header "__format/unicode.h"
+    header "__format/width_estimation_table.h"
+    header "__format/write_escaped.h"
+    header "__fwd/format.h"
+
+    export iterator.incrementable_traits
+    export string
+    export *
+  } // module format
+
+  module forward_list {
+    header "forward_list"
+    export *
+  }
+
+  module fstream {
+    header "fstream"
+    header "__fwd/fstream.h"
+    export *
+  }
+
+  module functional {
+    header "functional"
+    header "__functional/binary_function.h"
+    header "__functional/binary_negate.h"
+    header "__functional/bind_back.h"
+    header "__functional/bind_front.h"
+    header "__functional/bind.h"
+    header "__functional/binder1st.h"
+    header "__functional/binder2nd.h"
+    header "__functional/boyer_moore_searcher.h"
+    header "__functional/compose.h"
+    header "__functional/default_searcher.h"
+    header "__functional/function.h"
+    header "__functional/hash.h"
+    header "__functional/identity.h"
+    header "__functional/invoke.h"
+    header "__functional/is_transparent.h"
+    header "__functional/mem_fn.h"
+    header "__functional/mem_fun_ref.h"
+    header "__functional/not_fn.h"
+    header "__functional/operations.h"
+    header "__functional/perfect_forward.h"
+    header "__functional/pointer_to_binary_function.h"
+    header "__functional/pointer_to_unary_function.h"
+    header "__functional/ranges_operations.h"
+    header "__functional/reference_wrapper.h"
+    header "__functional/unary_function.h"
+    header "__functional/unary_negate.h"
+    header "__functional/weak_result_type.h"
+
+    export memory.shared_ptr
+    export utility.pair
+    export *
+  } // module functional
+
+  module future {
+    header "future"
+    export *
+  }
+
+  module initializer_list {
+    header "initializer_list"
+    export *
+  }
+
+  module iomanip {
+    header "iomanip"
+    export *
+  }
 
-// C standard library interfaces augmented/replaced in C++
-// <assert.h> provided by C library.
-module std_complex_h [system] {
-  header "complex.h"
-  export *
-}
-module std_ctype_h [system] {
-  header "ctype.h"
-  export *
-}
-module std_errno_h [system] {
-  header "errno.h"
-  export *
-}
-module std_fenv_h [system] {
-  header "fenv.h"
-  export *
-}
-module std_float_h [system] {
-  header "float.h"
-  export *
-}
-module std_inttypes_h [system] {
-  header "inttypes.h"
-  export *
-}
-// <iso646.h> provided by compiler.
-module std_locale_h [system] {
-  header "locale.h"
-  export *
-}
-module std_math_h [system] {
-  header "math.h"
-  export *
-}
-// <setjmp.h> provided by C library.
-// <signal.h> provided by C library.
-// FIXME: <stdalign.h> is missing.
-// <stdarg.h> provided by compiler.
-module std_stdatomic_h [system] {
-  header "stdatomic.h"
-  export *
-}
-module std_stdbool_h [system] {
-  // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
-  textual header "stdbool.h"
-  export *
-}
-module std_stddef_h [system] {
-  // <stddef.h>'s __need_* macros require textual inclusion.
-  textual header "stddef.h"
-  export *
-}
-module std_stdint_h [system] {
-  header "stdint.h"
-  export *
-}
-module std_stdio_h [system] {
-  // <stdio.h>'s __need_* macros require textual inclusion.
-  textual header "stdio.h"
-  export *
-}
-module std_stdlib_h [system] {
-  // <stdlib.h>'s __need_* macros require textual inclusion.
-  textual header "stdlib.h"
-  export *
-}
-module std_string_h [system] {
-  header "string.h"
-  export *
-}
-module std_tgmath_h [system] {
-  header "tgmath.h"
-  export *
-}
-module std_uchar_h [system] {
-  header "uchar.h"
-  export *
-}
-// <time.h> provided by C library.
-module std_wchar_h [system] {
-  // <wchar.h>'s __need_* macros require textual inclusion.
-  textual header "wchar.h"
-  export *
-}
-module std_wctype_h [system] {
-  header "wctype.h"
-  export *
-}
+  module ios {
+    header "ios"
+    header "__fwd/ios.h"
+    header "__ios/fpos.h"
+    export *
+  }
+
+  module iosfwd {
+    header "iosfwd"
+    export *
+  }
+
+  module iostream {
+    header "iostream"
+    header "__fwd/ostream.h"
+    export *
+  }
+
+  module istream {
+    header "istream"
+    header "__fwd/istream.h"
+    export *
+  }
 
-// Experimental C++ standard library interfaces
-module std_experimental [system] {
   module iterator {
-    header "experimental/iterator"
+    header "iterator"
+    header "__iterator/access.h"
+    header "__iterator/advance.h"
+    header "__iterator/aliasing_iterator.h"
+    header "__iterator/back_insert_iterator.h"
+    header "__iterator/bounded_iter.h"
+    header "__iterator/common_iterator.h"
+    header "__iterator/concepts.h"
+    header "__iterator/counted_iterator.h"
+    header "__iterator/cpp17_iterator_concepts.h"
+    header "__iterator/data.h"
+    header "__iterator/default_sentinel.h"
+    header "__iterator/distance.h"
+    header "__iterator/empty.h"
+    header "__iterator/erase_if_container.h"
+    header "__iterator/front_insert_iterator.h"
+    header "__iterator/incrementable_traits.h"
+    header "__iterator/indirectly_comparable.h"
+    header "__iterator/insert_iterator.h"
+    header "__iterator/istream_iterator.h"
+    header "__iterator/istreambuf_iterator.h"
+    header "__iterator/iter_move.h"
+    header "__iterator/iter_swap.h"
+    header "__iterator/iterator_traits.h"
+    header "__iterator/iterator_with_data.h"
+    header "__iterator/iterator.h"
+    header "__iterator/mergeable.h"
+    header "__iterator/move_iterator.h"
+    header "__iterator/move_sentinel.h"
+    header "__iterator/next.h"
+    header "__iterator/ostream_iterator.h"
+    header "__iterator/ostreambuf_iterator.h"
+    header "__iterator/permutable.h"
+    header "__iterator/prev.h"
+    header "__iterator/projected.h"
+    header "__iterator/ranges_iterator_traits.h"
+    header "__iterator/readable_traits.h"
+    header "__iterator/reverse_access.h"
+    header "__iterator/reverse_iterator.h"
+    header "__iterator/segmented_iterator.h"
+    header "__iterator/size.h"
+    header "__iterator/sortable.h"
+    header "__iterator/unreachable_sentinel.h"
+    header "__iterator/wrap_iter.h"
+    export *
+  }
+
+  module latch {
+    header "latch"
+    export *
+  }
+
+  module list {
+    header "list"
+    export *
+  }
+
+  module locale {
+    header "locale"
+    header "__locale_dir/locale_base_api.h"
+    header "__locale_dir/locale_base_api/locale_guard.h"
+    module locale_base_api {
+      textual header "__locale_dir/locale_base_api/android.h"
+      textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h"
+      textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h"
+      textual header "__locale_dir/locale_base_api/fuchsia.h"
+      textual header "__locale_dir/locale_base_api/ibm.h"
+      textual header "__locale_dir/locale_base_api/musl.h"
+      textual header "__locale_dir/locale_base_api/newlib.h"
+      textual header "__locale_dir/locale_base_api/openbsd.h"
+      textual header "__locale_dir/locale_base_api/win32.h"
+    }
+    export *
+  }
+
+  // TODO: Understand why this needs to live in its own module
+  module locale_base [system] {
+    header "__locale"
+    export *
+  }
+
+  module map {
+    header "map"
+    export *
+  }
+
+  module mdspan {
+    header "mdspan"
+    header "__mdspan/default_accessor.h"
+    header "__mdspan/extents.h"
+    header "__fwd/mdspan.h"
+    header "__mdspan/layout_left.h"
+    header "__mdspan/layout_right.h"
+    header "__mdspan/layout_stride.h"
+    header "__mdspan/mdspan.h"
     export *
   }
+
   module memory {
-    header "experimental/memory"
+    header "memory"
+    header "__fwd/memory.h"
+    header "__memory/addressof.h"
+    header "__memory/align.h"
+    header "__memory/aligned_alloc.h"
+    header "__memory/allocate_at_least.h"
+    header "__memory/allocation_guard.h"
+    header "__memory/allocator_arg_t.h"
+    header "__memory/allocator_destructor.h"
+    header "__memory/allocator_traits.h"
+    header "__memory/allocator.h"
+    header "__memory/assume_aligned.h"
+    header "__memory/auto_ptr.h"
+    header "__memory/builtin_new_allocator.h"
+    header "__memory/compressed_pair.h"
+    header "__memory/concepts.h"
+    header "__memory/construct_at.h"
+    header "__memory/destruct_n.h"
+    header "__memory/inout_ptr.h"
+    header "__memory/noexcept_move_assign_container.h"
+    header "__memory/out_ptr.h"
+    header "__memory/pointer_traits.h"
+    header "__memory/ranges_construct_at.h"
+    header "__memory/ranges_uninitialized_algorithms.h"
+    header "__memory/raw_storage_iterator.h"
+    header "__memory/shared_ptr.h"
+    header "__memory/swap_allocator.h"
+    header "__memory/temp_value.h"
+    header "__memory/temporary_buffer.h"
+    header "__memory/uninitialized_algorithms.h"
+    header "__memory/unique_ptr.h"
+    header "__memory/uses_allocator_construction.h"
+    header "__memory/uses_allocator.h"
+    header "__memory/voidify.h"
     export *
   }
-  module propagate_const {
-    header "experimental/propagate_const"
+
+  module memory_resource {
+    header "memory_resource"
+    header "__fwd/memory_resource.h"
+    header "__memory_resource/memory_resource.h"
+    header "__memory_resource/monotonic_buffer_resource.h"
+    header "__memory_resource/polymorphic_allocator.h"
+    header "__memory_resource/pool_options.h"
+    header "__memory_resource/synchronized_pool_resource.h"
+    header "__memory_resource/unsynchronized_pool_resource.h"
     export *
   }
-  module simd {
-    module aligned_tag          { private header "experimental/__simd/aligned_tag.h" }
-    module declaration          { private header "experimental/__simd/declaration.h" }
-    module reference            { private header "experimental/__simd/reference.h" }
-    module scalar               { private header "experimental/__simd/scalar.h" }
-    module simd                 { private header "experimental/__simd/simd.h" }
-    module simd_mask            { private header "experimental/__simd/simd_mask.h" }
-    module traits               { private header "experimental/__simd/traits.h" }
-    module utility              { private header "experimental/__simd/utility.h" }
-    module vec_ext              { private header "experimental/__simd/vec_ext.h" }
 
-    header "experimental/simd"
+  module mutex {
+    header "mutex"
+    header "__mutex/lock_guard.h"
+    header "__mutex/mutex.h"
+    header "__mutex/once_flag.h"
+    header "__mutex/tag_types.h"
+    header "__mutex/unique_lock.h"
     export *
   }
-  module type_traits {
-    header "experimental/type_traits"
+
+  module new {
+    header "new"
     export *
   }
-  module utility {
-    header "experimental/utility"
+
+  module numbers {
+    header "numbers"
     export *
   }
-  module __config {
-    textual header "experimental/__config"
+
+  module numeric {
+    header "numeric"
+    header "__numeric/accumulate.h"
+    header "__numeric/adjacent_difference.h"
+    header "__numeric/exclusive_scan.h"
+    header "__numeric/gcd_lcm.h"
+    header "__numeric/inclusive_scan.h"
+    header "__numeric/inner_product.h"
+    header "__numeric/iota.h"
+    header "__numeric/midpoint.h"
+    header "__numeric/partial_sum.h"
+    header "__numeric/pstl.h"
+    header "__numeric/reduce.h"
+    header "__numeric/saturation_arithmetic.h"
+    header "__numeric/transform_exclusive_scan.h"
+    header "__numeric/transform_inclusive_scan.h"
+    header "__numeric/transform_reduce.h"
     export *
   }
-}
 
-// Convenience method to get all of the above modules in a single import statement.
-// Importing only the needed modules is likely to be more performant.
-module std [system] {
-  header "__std_clang_module"
-  export *
-}
+  module optional {
+    header "optional"
+    export *
+  }
 
-// Implementation detail headers that are private to libc++. These modules
-// must not be directly imported.
-module std_private_assert            [system] {
-  header "__assert"
-  export *
-}
-module std_private_bit_reference     [system] {
-  header "__bit_reference"
-  export *
-}
-module std_private_fwd_bit_reference [system] {
-  header "__fwd/bit_reference.h"
-}
-module std_private_fwd_byte [system] {
-  header "__fwd/byte.h"
-}
-module std_private_config            [system] {
-  textual header "__config"
-  textual header "__configuration/abi.h"
-  textual header "__configuration/availability.h"
-  textual header "__configuration/compiler.h"
-  textual header "__configuration/language.h"
-  textual header "__configuration/platform.h"
-  export *
-}
-module std_private_hash_table        [system] {
-  header "__hash_table"
-  export *
-}
-module std_private_locale            [system] {
-  header "__locale"
-  export *
-}
-module std_private_mbstate_t         [system] {
-  header "__mbstate_t.h"
-  export *
-}
-module std_private_node_handle       [system] {
-  header "__node_handle"
-  export *
-}
-module std_private_split_buffer      [system] {
-  header "__split_buffer"
-  export *
-}
-module std_private_std_mbstate_t     [system] {
-  header "__std_mbstate_t.h"
-  export *
-}
-module std_private_tree              [system] {
-  header "__tree"
-  export *
-}
-module std_private_undef_macros      [system] {
-  textual header "__undef_macros"
-  export *
-}
-module std_private_verbose_abort     [system] {
-  header "__verbose_abort"
-  export *
-}
+  module ostream {
+    header "ostream"
+    header "__ostream/basic_ostream.h"
+    header "__ostream/print.h"
+
+    export print
+    export streambuf
+    export *
+  }
+
+  module print {
+    header "print"
+    export *
+  }
+
+  module queue {
+    header "queue"
+    header "__fwd/queue.h"
+    export *
+  }
+
+  module random {
+    header "random"
+    header "__random/bernoulli_distribution.h"
+    header "__random/binomial_distribution.h"
+    header "__random/cauchy_distribution.h"
+    header "__random/chi_squared_distribution.h"
+    header "__random/clamp_to_integral.h"
+    header "__random/default_random_engine.h"
+    header "__random/discard_block_engine.h"
+    header "__random/discrete_distribution.h"
+    header "__random/exponential_distribution.h"
+    header "__random/extreme_value_distribution.h"
+    header "__random/fisher_f_distribution.h"
+    header "__random/gamma_distribution.h"
+    header "__random/generate_canonical.h"
+    header "__random/geometric_distribution.h"
+    header "__random/independent_bits_engine.h"
+    header "__random/is_seed_sequence.h"
+    header "__random/is_valid.h"
+    header "__random/knuth_b.h"
+    header "__random/linear_congruential_engine.h"
+    header "__random/log2.h"
+    header "__random/lognormal_distribution.h"
+    header "__random/mersenne_twister_engine.h"
+    header "__random/negative_binomial_distribution.h"
+    header "__random/normal_distribution.h"
+    header "__random/piecewise_constant_distribution.h"
+    header "__random/piecewise_linear_distribution.h"
+    header "__random/poisson_distribution.h"
+    header "__random/random_device.h"
+    header "__random/ranlux.h"
+    header "__random/seed_seq.h"
+    header "__random/shuffle_order_engine.h"
+    header "__random/student_t_distribution.h"
+    header "__random/subtract_with_carry_engine.h"
+    header "__random/uniform_int_distribution.h"
+    header "__random/uniform_random_bit_generator.h"
+    header "__random/uniform_real_distribution.h"
+    header "__random/weibull_distribution.h"
+
+    export *
+  }
+
+  module ranges {
+    header "ranges"
+    header "__fwd/subrange.h"
+    header "__ranges/access.h"
+    header "__ranges/all.h"
+    header "__ranges/as_rvalue_view.h"
+    header "__ranges/chunk_by_view.h"
+    header "__ranges/common_view.h"
+    header "__ranges/concepts.h"
+    header "__ranges/container_compatible_range.h"
+    header "__ranges/counted.h"
+    header "__ranges/dangling.h"
+    header "__ranges/data.h"
+    header "__ranges/drop_view.h"
+    header "__ranges/drop_while_view.h"
+    header "__ranges/elements_view.h"
+    header "__ranges/empty_view.h"
+    header "__ranges/empty.h"
+    header "__ranges/enable_borrowed_range.h"
+    header "__ranges/enable_view.h"
+    header "__ranges/filter_view.h"
+    header "__ranges/from_range.h"
+    header "__ranges/iota_view.h"
+    header "__ranges/istream_view.h"
+    header "__ranges/join_view.h"
+    header "__ranges/lazy_split_view.h"
+    header "__ranges/movable_box.h"
+    header "__ranges/non_propagating_cache.h"
+    header "__ranges/owning_view.h"
+    header "__ranges/range_adaptor.h"
+    header "__ranges/rbegin.h"
+    header "__ranges/ref_view.h"
+    header "__ranges/rend.h"
+    header "__ranges/repeat_view.h"
+    header "__ranges/reverse_view.h"
+    header "__ranges/single_view.h"
+    header "__ranges/size.h"
+    header "__ranges/split_view.h"
+    header "__ranges/subrange.h"
+    header "__ranges/take_view.h"
+    header "__ranges/take_while_view.h"
+    header "__ranges/to.h"
+    header "__ranges/transform_view.h"
+    header "__ranges/view_interface.h"
+    header "__ranges/views.h"
+    header "__ranges/zip_view.h"
+
+    export functional.bind_back
+    export functional.compose
+    export functional.perfect_forward
+    export functional.perfect_forward
+    export iterator.concepts
+    export iterator.iterator_with_data
+    export iterator.segmented_iterator
+    export utility.pair
+    export span
+    export *
+  } // module ranges
+
+  module ratio {
+    header "ratio"
+    export *
+  }
+
+  module regex {
+    header "regex"
+    export *
+  }
+
+  module scoped_allocator {
+    header "scoped_allocator"
+    export *
+  }
+
+  module semaphore {
+    header "semaphore"
+    export *
+  }
+
+  module set {
+    header "set"
+    export *
+  }
+
+  module shared_mutex {
+    header "shared_mutex"
+    export std_version
+  }
+
+  module source_location {
+    header "source_location"
+    export *
+  }
+
+  module span {
+    header "span"
+    header "__fwd/span.h"
+    export *
+  }
+
+  module sstream {
+    header "sstream"
+    header "__fwd/sstream.h"
+    export *
+  }
+
+  module stack {
+    header "stack"
+    header "__fwd/stack.h"
+    export *
+  }
+
+  module stdexcept {
+    header "stdexcept"
+    export *
+  }
+
+  module stop_token {
+    header "stop_token"
+    header "__stop_token/atomic_unique_lock.h"
+    header "__stop_token/intrusive_list_view.h"
+    header "__stop_token/intrusive_shared_ptr.h"
+    header "__stop_token/stop_callback.h"
+    header "__stop_token/stop_source.h"
+    header "__stop_token/stop_state.h"
+    header "__stop_token/stop_token.h"
+    export *
+  }
+
+  module streambuf {
+    header "streambuf"
+    header "__fwd/streambuf.h"
+    export *
+  }
+
+  module string {
+    header "string"
+    header "__fwd/string.h"
+    header "__string/char_traits.h"
+    header "__string/constexpr_c_functions.h"
+    header "__string/extern_template_lists.h"
+    export *
+  }
+
+  module string_view {
+    header "string_view"
+    header "__fwd/string_view.h"
+    export *
+  }
+
+  module strstream {
+    header "strstream"
+    export *
+  }
+
+  module syncstream {
+    header "syncstream"
+    export *
+  }
+
+  module system_error {
+    header "system_error"
+    header "__system_error/errc.h"
+    header "__system_error/error_category.h"
+    header "__system_error/error_code.h"
+    header "__system_error/error_condition.h"
+    header "__system_error/system_error.h"
+
+    export functional.hash
+    export *
+  }
+
+  module thread {
+    header "thread"
+    header "__thread/formatter.h"
+    header "__thread/id.h"
+    header "__thread/jthread.h"
+    header "__thread/poll_with_backoff.h"
+    header "__thread/support.h"
+    header "__thread/this_thread.h"
+    header "__thread/thread.h"
+    header "__thread/timed_backoff_policy.h"
+    module support {
+      textual header "__thread/support/c11.h"
+      textual header "__thread/support/external.h"
+      textual header "__thread/support/pthread.h"
+      textual header "__thread/support/windows.h"
+    }
+    export *
+  }
+
+  module tuple {
+    header "tuple"
+    header "__tuple/find_index.h"
+    header "__tuple/ignore.h"
+    header "__tuple/make_tuple_types.h"
+    header "__tuple/sfinae_helpers.h"
+    header "__tuple/tuple_element.h"
+    header "__tuple/tuple_indices.h"
+    header "__tuple/tuple_like_ext.h"
+    header "__tuple/tuple_like_no_subrange.h"
+    header "__tuple/tuple_like.h"
+    header "__tuple/tuple_size.h"
+    header "__tuple/tuple_types.h"
+    export *
+  }
+
+  module typeindex {
+    header "typeindex"
+    export *
+  }
+
+  module typeinfo {
+    header "typeinfo"
+    export *
+  }
+
+  module unordered_map {
+    header "unordered_map"
+    export *
+  }
+
+  module unordered_set {
+    header "unordered_set"
+    export *
+  }
+
+  module utility {
+    header "utility"
+    header "__utility/as_const.h"
+    header "__utility/as_lvalue.h"
+    header "__utility/auto_cast.h"
+    header "__utility/cmp.h"
+    header "__utility/convert_to_integral.h"
+    header "__utility/empty.h"
+    header "__utility/exception_guard.h"
+    header "__utility/exchange.h"
+    header "__utility/forward_like.h"
+    header "__utility/in_place.h"
+    header "__utility/integer_sequence.h"
+    header "__utility/is_pointer_in_range.h"
+    header "__utility/is_valid_range.h"
+    header "__utility/move.h"
+    header "__utility/no_destroy.h"
+    header "__utility/pair.h"
+    header "__utility/piecewise_construct.h"
+    header "__utility/priority_tag.h"
+    header "__utility/private_constructor_tag.h"
+    header "__utility/rel_ops.h"
+    header "__utility/small_buffer.h"
+    header "__utility/swap.h"
+    header "__utility/to_underlying.h"
+    header "__utility/unreachable.h"
+
+    export *
+  }
 
-module std_private_algorithm_adjacent_find                               [system] { header "__algorithm/adjacent_find.h" }
-module std_private_algorithm_all_of                                      [system] { header "__algorithm/all_of.h" }
-module std_private_algorithm_any_of                                      [system] { header "__algorithm/any_of.h" }
-module std_private_algorithm_binary_search                               [system] { header "__algorithm/binary_search.h" }
-module std_private_algorithm_clamp                                       [system] { header "__algorithm/clamp.h" }
-module std_private_algorithm_comp                                        [system] { header "__algorithm/comp.h" }
-module std_private_algorithm_comp_ref_type                               [system] { header "__algorithm/comp_ref_type.h" }
-module std_private_algorithm_copy                                        [system] {
-  header "__algorithm/copy.h"
-  export std_private_algorithm_copy_move_common
-}
-module std_private_algorithm_copy_backward                               [system] { header "__algorithm/copy_backward.h" }
-module std_private_algorithm_copy_if                                     [system] { header "__algorithm/copy_if.h" }
-module std_private_algorithm_copy_move_common                            [system] {
-  header "__algorithm/copy_move_common.h"
-  export std_private_type_traits_is_trivially_copyable
-}
-module std_private_algorithm_copy_n                                      [system] { header "__algorithm/copy_n.h" }
-module std_private_algorithm_count                                       [system] { header "__algorithm/count.h" }
-module std_private_algorithm_count_if                                    [system] { header "__algorithm/count_if.h" }
-module std_private_algorithm_equal                                       [system] { header "__algorithm/equal.h" }
-module std_private_algorithm_equal_range                                 [system] { header "__algorithm/equal_range.h" }
-module std_private_algorithm_fill                                        [system] { header "__algorithm/fill.h" }
-module std_private_algorithm_fill_n                                      [system] { header "__algorithm/fill_n.h" }
-module std_private_algorithm_find                                        [system] {
-  header "__algorithm/find.h"
-  export std_private_algorithm_unwrap_iter
-}
-module std_private_algorithm_find_end                                    [system] { header "__algorithm/find_end.h" }
-module std_private_algorithm_find_first_of                               [system] { header "__algorithm/find_first_of.h" }
-module std_private_algorithm_find_if                                     [system] { header "__algorithm/find_if.h" }
-module std_private_algorithm_find_if_not                                 [system] { header "__algorithm/find_if_not.h" }
-module std_private_algorithm_find_segment_if                             [system] { header "__algorithm/find_segment_if.h" }
-module std_private_algorithm_fold                                        [system] { header "__algorithm/fold.h" }
-module std_private_algorithm_for_each                                    [system] { header "__algorithm/for_each.h" }
-module std_private_algorithm_for_each_n                                  [system] { header "__algorithm/for_each_n.h" }
-module std_private_algorithm_for_each_segment                            [system] { header "__algorithm/for_each_segment.h" }
-module std_private_algorithm_generate                                    [system] { header "__algorithm/generate.h" }
-module std_private_algorithm_generate_n                                  [system] { header "__algorithm/generate_n.h" }
-module std_private_algorithm_half_positive                               [system] { header "__algorithm/half_positive.h" }
-module std_private_algorithm_in_found_result                             [system] { header "__algorithm/in_found_result.h" }
-module std_private_algorithm_in_fun_result                               [system] { header "__algorithm/in_fun_result.h" }
-module std_private_algorithm_in_in_out_result                            [system] { header "__algorithm/in_in_out_result.h" }
-module std_private_algorithm_in_in_result                                [system] { header "__algorithm/in_in_result.h" }
-module std_private_algorithm_in_out_out_result                           [system] { header "__algorithm/in_out_out_result.h" }
-module std_private_algorithm_in_out_result                               [system] { header "__algorithm/in_out_result.h" }
-module std_private_algorithm_includes                                    [system] { header "__algorithm/includes.h" }
-module std_private_algorithm_inplace_merge                               [system] { header "__algorithm/inplace_merge.h" }
-module std_private_algorithm_is_heap                                     [system] { header "__algorithm/is_heap.h" }
-module std_private_algorithm_is_heap_until                               [system] { header "__algorithm/is_heap_until.h" }
-module std_private_algorithm_is_partitioned                              [system] { header "__algorithm/is_partitioned.h" }
-module std_private_algorithm_is_permutation                              [system] { header "__algorithm/is_permutation.h" }
-module std_private_algorithm_is_sorted                                   [system] { header "__algorithm/is_sorted.h" }
-module std_private_algorithm_is_sorted_until                             [system] { header "__algorithm/is_sorted_until.h" }
-module std_private_algorithm_iter_swap                                   [system] { header "__algorithm/iter_swap.h" }
-module std_private_algorithm_iterator_operations                         [system] {
-  header "__algorithm/iterator_operations.h"
-  export *
-}
-module std_private_algorithm_lexicographical_compare                     [system] { header "__algorithm/lexicographical_compare.h" }
-module std_private_algorithm_lexicographical_compare_three_way           [system] { header "__algorithm/lexicographical_compare_three_way.h" }
-module std_private_algorithm_lower_bound                                 [system] { header "__algorithm/lower_bound.h" }
-module std_private_algorithm_make_heap                                   [system] { header "__algorithm/make_heap.h" }
-module std_private_algorithm_make_projected                              [system] { header "__algorithm/make_projected.h" }
-module std_private_algorithm_max                                         [system] { header "__algorithm/max.h" }
-module std_private_algorithm_max_element                                 [system] { header "__algorithm/max_element.h" }
-module std_private_algorithm_merge                                       [system] { header "__algorithm/merge.h" }
-module std_private_algorithm_min                                         [system] { header "__algorithm/min.h" }
-module std_private_algorithm_min_element                                 [system] { header "__algorithm/min_element.h" }
-module std_private_algorithm_min_max_result                              [system] { header "__algorithm/min_max_result.h" }
-module std_private_algorithm_minmax                                      [system] {
-  header "__algorithm/minmax.h"
-  export *
-}
-module std_private_algorithm_minmax_element                              [system] { header "__algorithm/minmax_element.h" }
-module std_private_algorithm_mismatch                                    [system] {
-  header "__algorithm/mismatch.h"
-  export std_private_algorithm_simd_utils
-  export std_private_iterator_aliasing_iterator
-}
-module std_private_algorithm_move                                        [system] { header "__algorithm/move.h" }
-module std_private_algorithm_move_backward                               [system] { header "__algorithm/move_backward.h" }
-module std_private_algorithm_next_permutation                            [system] { header "__algorithm/next_permutation.h" }
-module std_private_algorithm_none_of                                     [system] { header "__algorithm/none_of.h" }
-module std_private_algorithm_nth_element                                 [system] { header "__algorithm/nth_element.h" }
-module std_private_algorithm_partial_sort                                [system] { header "__algorithm/partial_sort.h" }
-module std_private_algorithm_partial_sort_copy                           [system] { header "__algorithm/partial_sort_copy.h" }
-module std_private_algorithm_partition                                   [system] { header "__algorithm/partition.h" }
-module std_private_algorithm_partition_copy                              [system] { header "__algorithm/partition_copy.h" }
-module std_private_algorithm_partition_point                             [system] { header "__algorithm/partition_point.h" }
-module std_private_algorithm_pop_heap                                    [system] { header "__algorithm/pop_heap.h" }
-module std_private_algorithm_prev_permutation                            [system] { header "__algorithm/prev_permutation.h" }
-module std_private_algorithm_pstl                                        [system] {
-  header "__algorithm/pstl.h"
-  export *
-}
-module std_private_algorithm_push_heap                                   [system] { header "__algorithm/push_heap.h" }
-module std_private_algorithm_ranges_adjacent_find                        [system] { header "__algorithm/ranges_adjacent_find.h" }
-module std_private_algorithm_ranges_all_of                               [system] { header "__algorithm/ranges_all_of.h" }
-module std_private_algorithm_ranges_any_of                               [system] { header "__algorithm/ranges_any_of.h" }
-module std_private_algorithm_ranges_binary_search                        [system] {
-  header "__algorithm/ranges_binary_search.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_clamp                                [system] {
-  header "__algorithm/ranges_clamp.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_contains                             [system] { header "__algorithm/ranges_contains.h" }
-module std_private_algorithm_ranges_contains_subrange                    [system] { header "__algorithm/ranges_contains_subrange.h" }
-module std_private_algorithm_ranges_copy                                 [system] {
-  header "__algorithm/ranges_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_copy_backward                        [system] {
-  header "__algorithm/ranges_copy_backward.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_copy_if                              [system] {
-  header "__algorithm/ranges_copy_if.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_copy_n                               [system] {
-  header "__algorithm/ranges_copy_n.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_count                                [system] { header "__algorithm/ranges_count.h" }
-module std_private_algorithm_ranges_count_if                             [system] { header "__algorithm/ranges_count_if.h" }
-module std_private_algorithm_ranges_ends_with                            [system] { header "__algorithm/ranges_ends_with.h" }
-module std_private_algorithm_ranges_equal                                [system] { header "__algorithm/ranges_equal.h" }
-module std_private_algorithm_ranges_equal_range                          [system] {
-  header "__algorithm/ranges_equal_range.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_fill                                 [system] { header "__algorithm/ranges_fill.h" }
-module std_private_algorithm_ranges_fill_n                               [system] { header "__algorithm/ranges_fill_n.h" }
-module std_private_algorithm_ranges_find                                 [system] { header "__algorithm/ranges_find.h" }
-module std_private_algorithm_ranges_find_end                             [system] { header "__algorithm/ranges_find_end.h" }
-module std_private_algorithm_ranges_find_first_of                        [system] { header "__algorithm/ranges_find_first_of.h" }
-module std_private_algorithm_ranges_find_if                              [system] { header "__algorithm/ranges_find_if.h" }
-module std_private_algorithm_ranges_find_if_not                          [system] { header "__algorithm/ranges_find_if_not.h" }
-module std_private_algorithm_ranges_find_last                            [system] { header "__algorithm/ranges_find_last.h" }
-module std_private_algorithm_ranges_for_each                             [system] {
-  header "__algorithm/ranges_for_each.h"
-  export std_private_algorithm_in_fun_result
-}
-module std_private_algorithm_ranges_for_each_n                           [system] {
-  header "__algorithm/ranges_for_each_n.h"
-  export std_private_algorithm_in_fun_result
-}
-module std_private_algorithm_ranges_generate                             [system] { header "__algorithm/ranges_generate.h" }
-module std_private_algorithm_ranges_generate_n                           [system] { header "__algorithm/ranges_generate_n.h" }
-module std_private_algorithm_ranges_includes                             [system] {
-  header "__algorithm/ranges_includes.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_inplace_merge                        [system] {
-  header "__algorithm/ranges_inplace_merge.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_is_heap                              [system] {
-  header "__algorithm/ranges_is_heap.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_is_heap_until                        [system] {
-  header "__algorithm/ranges_is_heap_until.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_is_partitioned                       [system] { header "__algorithm/ranges_is_partitioned.h" }
-module std_private_algorithm_ranges_is_permutation                       [system] { header "__algorithm/ranges_is_permutation.h" }
-module std_private_algorithm_ranges_is_sorted                            [system] {
-  header "__algorithm/ranges_is_sorted.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_is_sorted_until                      [system] {
-  header "__algorithm/ranges_is_sorted_until.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_iterator_concept                     [system] { header "__algorithm/ranges_iterator_concept.h" }
-module std_private_algorithm_ranges_lexicographical_compare              [system] {
-  header "__algorithm/ranges_lexicographical_compare.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_lower_bound                          [system] {
-  header "__algorithm/ranges_lower_bound.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_make_heap                            [system] {
-  header "__algorithm/ranges_make_heap.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_max                                  [system] {
-  header "__algorithm/ranges_max.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_max_element                          [system] {
-  header "__algorithm/ranges_max_element.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_merge                                [system] {
-  header "__algorithm/ranges_merge.h"
-  export std_private_algorithm_in_in_out_result
-}
-module std_private_algorithm_ranges_min                                  [system] {
-  header "__algorithm/ranges_min.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_min_element                          [system] {
-  header "__algorithm/ranges_min_element.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_minmax                               [system] {
-  header "__algorithm/ranges_minmax.h"
-  export std_private_functional_ranges_operations
-  export std_private_algorithm_min_max_result
-}
-module std_private_algorithm_ranges_minmax_element                       [system] {
-  header "__algorithm/ranges_minmax_element.h"
-  export std_private_functional_ranges_operations
-  export std_private_algorithm_min_max_result
-}
-module std_private_algorithm_ranges_mismatch                             [system] {
-  header "__algorithm/ranges_mismatch.h"
-  export std_private_algorithm_in_in_result
-}
-module std_private_algorithm_ranges_move                                 [system] {
-  header "__algorithm/ranges_move.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_move_backward                        [system] {
-  header "__algorithm/ranges_move_backward.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_next_permutation                     [system] {
-  header "__algorithm/ranges_next_permutation.h"
-  export std_private_algorithm_in_found_result
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_none_of                              [system] { header "__algorithm/ranges_none_of.h" }
-module std_private_algorithm_ranges_nth_element                          [system] {
-  header "__algorithm/ranges_nth_element.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_partial_sort                         [system] {
-  header "__algorithm/ranges_partial_sort.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_partial_sort_copy                    [system] {
-  header "__algorithm/ranges_partial_sort_copy.h"
-  export std_private_algorithm_in_out_result
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_partition                            [system] { header "__algorithm/ranges_partition.h" }
-module std_private_algorithm_ranges_partition_copy                       [system] { header "__algorithm/ranges_partition_copy.h" }
-module std_private_algorithm_ranges_partition_point                      [system] { header "__algorithm/ranges_partition_point.h" }
-module std_private_algorithm_ranges_pop_heap                             [system] {
-  header "__algorithm/ranges_pop_heap.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_prev_permutation                     [system] {
-  header "__algorithm/ranges_prev_permutation.h"
-  export std_private_algorithm_in_found_result
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_push_heap                            [system] {
-  header "__algorithm/ranges_push_heap.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_remove                               [system] { header "__algorithm/ranges_remove.h" }
-module std_private_algorithm_ranges_remove_copy                          [system] {
-  header "__algorithm/ranges_remove_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_remove_copy_if                       [system] {
-  header "__algorithm/ranges_remove_copy_if.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_remove_if                            [system] { header "__algorithm/ranges_remove_if.h" }
-module std_private_algorithm_ranges_replace                              [system] { header "__algorithm/ranges_replace.h" }
-module std_private_algorithm_ranges_replace_copy                         [system] {
-  header "__algorithm/ranges_replace_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_replace_copy_if                      [system] {
-  header "__algorithm/ranges_replace_copy_if.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_replace_if                           [system] { header "__algorithm/ranges_replace_if.h" }
-module std_private_algorithm_ranges_reverse                              [system] { header "__algorithm/ranges_reverse.h" }
-module std_private_algorithm_ranges_reverse_copy                         [system] {
-  header "__algorithm/ranges_reverse_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_rotate                               [system] { header "__algorithm/ranges_rotate.h" }
-module std_private_algorithm_ranges_rotate_copy                          [system] {
-  header "__algorithm/ranges_rotate_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_sample                               [system] { header "__algorithm/ranges_sample.h" }
-module std_private_algorithm_ranges_search                               [system] { header "__algorithm/ranges_search.h" }
-module std_private_algorithm_ranges_search_n                             [system] { header "__algorithm/ranges_search_n.h" }
-module std_private_algorithm_ranges_set_difference                       [system] {
-  header "__algorithm/ranges_set_difference.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_set_intersection                     [system] {
-  header "__algorithm/ranges_set_intersection.h"
-  export std_private_algorithm_in_in_out_result
-}
-module std_private_algorithm_ranges_set_symmetric_difference             [system] {
-  header "__algorithm/ranges_set_symmetric_difference.h"
-  export std_private_algorithm_in_in_out_result
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_set_union                            [system] {
-  header "__algorithm/ranges_set_union.h"
-  export std_private_algorithm_in_in_out_result
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_shuffle                              [system] { header "__algorithm/ranges_shuffle.h" }
-module std_private_algorithm_ranges_sort                                 [system] {
-  header "__algorithm/ranges_sort.h"
-  export std_private_algorithm_make_projected
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_sort_heap                            [system] {
-  header "__algorithm/ranges_sort_heap.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_stable_partition                     [system] { header "__algorithm/ranges_stable_partition.h" }
-module std_private_algorithm_ranges_stable_sort                          [system] {
-  header "__algorithm/ranges_stable_sort.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_ranges_starts_with                          [system] { header "__algorithm/ranges_starts_with.h" }
-module std_private_algorithm_ranges_swap_ranges                          [system] {
-  header "__algorithm/ranges_swap_ranges.h"
-  export std_private_algorithm_in_in_result
-}
-module std_private_algorithm_ranges_transform                            [system] {
-  header "__algorithm/ranges_transform.h"
-  export std_private_algorithm_in_in_out_result
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_unique                               [system] { header "__algorithm/ranges_unique.h" }
-module std_private_algorithm_ranges_unique_copy                          [system] {
-  header "__algorithm/ranges_unique_copy.h"
-  export std_private_algorithm_in_out_result
-}
-module std_private_algorithm_ranges_upper_bound                          [system] {
-  header "__algorithm/ranges_upper_bound.h"
-  export std_private_functional_ranges_operations
-}
-module std_private_algorithm_remove                                      [system] { header "__algorithm/remove.h" }
-module std_private_algorithm_remove_copy                                 [system] { header "__algorithm/remove_copy.h" }
-module std_private_algorithm_remove_copy_if                              [system] { header "__algorithm/remove_copy_if.h" }
-module std_private_algorithm_remove_if                                   [system] { header "__algorithm/remove_if.h" }
-module std_private_algorithm_replace                                     [system] { header "__algorithm/replace.h" }
-module std_private_algorithm_replace_copy                                [system] { header "__algorithm/replace_copy.h" }
-module std_private_algorithm_replace_copy_if                             [system] { header "__algorithm/replace_copy_if.h" }
-module std_private_algorithm_replace_if                                  [system] { header "__algorithm/replace_if.h" }
-module std_private_algorithm_reverse                                     [system] { header "__algorithm/reverse.h" }
-module std_private_algorithm_reverse_copy                                [system] { header "__algorithm/reverse_copy.h" }
-module std_private_algorithm_rotate                                      [system] { header "__algorithm/rotate.h" }
-module std_private_algorithm_rotate_copy                                 [system] { header "__algorithm/rotate_copy.h" }
-module std_private_algorithm_sample                                      [system] { header "__algorithm/sample.h" }
-module std_private_algorithm_search                                      [system] { header "__algorithm/search.h" }
-module std_private_algorithm_search_n                                    [system] { header "__algorithm/search_n.h" }
-module std_private_algorithm_set_difference                              [system] { header "__algorithm/set_difference.h" }
-module std_private_algorithm_set_intersection                            [system] { header "__algorithm/set_intersection.h" }
-module std_private_algorithm_set_symmetric_difference                    [system] { header "__algorithm/set_symmetric_difference.h" }
-module std_private_algorithm_set_union                                   [system] { header "__algorithm/set_union.h" }
-module std_private_algorithm_shift_left                                  [system] { header "__algorithm/shift_left.h" }
-module std_private_algorithm_shift_right                                 [system] { header "__algorithm/shift_right.h" }
-module std_private_algorithm_shuffle                                     [system] { header "__algorithm/shuffle.h" }
-module std_private_algorithm_sift_down                                   [system] { header "__algorithm/sift_down.h" }
-module std_private_algorithm_sort                                        [system] {
-  header "__algorithm/sort.h"
-  export std_private_debug_utils_strict_weak_ordering_check
-}
-module std_private_algorithm_simd_utils                                  [system] { header "__algorithm/simd_utils.h" }
-module std_private_algorithm_sort_heap                                   [system] { header "__algorithm/sort_heap.h" }
-module std_private_algorithm_stable_partition                            [system] { header "__algorithm/stable_partition.h" }
-module std_private_algorithm_stable_sort                                 [system] { header "__algorithm/stable_sort.h" }
-module std_private_algorithm_swap_ranges                                 [system] {
-  header "__algorithm/swap_ranges.h"
-  export std_private_algorithm_iterator_operations
-}
-module std_private_algorithm_three_way_comp_ref_type                     [system] { header "__algorithm/three_way_comp_ref_type.h" }
-module std_private_algorithm_transform                                   [system] { header "__algorithm/transform.h" }
-module std_private_algorithm_uniform_random_bit_generator_adaptor        [system] { header "__algorithm/uniform_random_bit_generator_adaptor.h" }
-module std_private_algorithm_unique                                      [system] { header "__algorithm/unique.h" }
-module std_private_algorithm_unique_copy                                 [system] { header "__algorithm/unique_copy.h" }
-module std_private_algorithm_unwrap_iter                                 [system] {
-  header "__algorithm/unwrap_iter.h"
-  export std_private_iterator_iterator_traits
-}
-module std_private_algorithm_unwrap_range                                [system] {
-  header "__algorithm/unwrap_range.h"
-  export std_private_utility_pair
-}
-module std_private_algorithm_upper_bound                                 [system] { header "__algorithm/upper_bound.h" }
+  module valarray {
+    header "valarray"
+    export *
+  }
 
-module std_private_array_array_fwd [system] { header "__fwd/array.h" }
+  module variant {
+    header "variant"
+    header "__variant/monostate.h"
+    export *
+  }
 
-module std_private_atomic_aliases             [system] {
-  header "__atomic/aliases.h"
-  export std_private_atomic_atomic
-}
-module std_private_atomic_atomic              [system] {
-  header "__atomic/atomic.h"
-  export std_private_atomic_atomic_base
-}
-module std_private_atomic_atomic_base         [system] { header "__atomic/atomic_base.h" }
-module std_private_atomic_atomic_flag         [system] {
-  header "__atomic/atomic_flag.h"
-  export *
-}
-module std_private_atomic_atomic_init         [system] { header "__atomic/atomic_init.h" }
-module std_private_atomic_atomic_lock_free    [system] { header "__atomic/atomic_lock_free.h" }
-module std_private_atomic_atomic_ref          [system] { header "__atomic/atomic_ref.h" }
-module std_private_atomic_atomic_sync         [system] {
-  header "__atomic/atomic_sync.h"
-  export std_private_atomic_to_gcc_order
-}
-module std_private_atomic_check_memory_order  [system] { header "__atomic/check_memory_order.h" }
-module std_private_atomic_contention_t        [system] { header "__atomic/contention_t.h" }
-module std_private_atomic_cxx_atomic_impl     [system] { header "__atomic/cxx_atomic_impl.h" }
-module std_private_atomic_fence               [system] { header "__atomic/fence.h" }
-module std_private_atomic_is_always_lock_free [system] { header "__atomic/is_always_lock_free.h" }
-module std_private_atomic_kill_dependency     [system] { header "__atomic/kill_dependency.h" }
-module std_private_atomic_memory_order        [system] { header "__atomic/memory_order.h" }
-module std_private_atomic_to_gcc_order        [system] {
-  header "__atomic/to_gcc_order.h"
-  export std_private_atomic_memory_order
-}
+  module vector {
+    header "vector"
+    header "__fwd/vector.h"
+    export *
+  }
 
-module std_private_bit_bit_cast       [system] { header "__bit/bit_cast.h" }
-module std_private_bit_bit_ceil       [system] { header "__bit/bit_ceil.h" }
-module std_private_bit_bit_floor      [system] { header "__bit/bit_floor.h" }
-module std_private_bit_bit_log2       [system] { header "__bit/bit_log2.h" }
-module std_private_bit_bit_width      [system] { header "__bit/bit_width.h" }
-module std_private_bit_blsr           [system] { header "__bit/blsr.h" }
-module std_private_bit_byteswap       [system] { header "__bit/byteswap.h" }
-module std_private_bit_countl         [system] { header "__bit/countl.h" }
-module std_private_bit_countr         [system] { header "__bit/countr.h" }
-module std_private_bit_endian         [system] { header "__bit/endian.h" }
-module std_private_bit_has_single_bit [system] { header "__bit/has_single_bit.h" }
-module std_private_bit_invert_if      [system] { header "__bit/invert_if.h" }
-module std_private_bit_popcount       [system] { header "__bit/popcount.h" }
-module std_private_bit_rotate         [system] { header "__bit/rotate.h" }
-
-module std_private_chrono_calendar               [system] { header "__chrono/calendar.h" }
-module std_private_chrono_concepts               [system] { header "__chrono/concepts.h" }
-module std_private_chrono_convert_to_timespec    [system] { header "__chrono/convert_to_timespec.h" }
-module std_private_chrono_convert_to_tm          [system] { header "__chrono/convert_to_tm.h" }
-module std_private_chrono_day                    [system] { header "__chrono/day.h" }
-module std_private_chrono_duration               [system] {
-  header "__chrono/duration.h"
-  export std_private_type_traits_is_convertible
-}
-module std_private_chrono_exception              [system] { header "__chrono/exception.h" }
-module std_private_chrono_file_clock             [system] { header "__chrono/file_clock.h" }
-module std_private_chrono_formatter              [system] {
-  header "__chrono/formatter.h"
-}
-module std_private_chrono_hh_mm_ss               [system] { header "__chrono/hh_mm_ss.h" }
-module std_private_chrono_high_resolution_clock  [system] {
-  header "__chrono/high_resolution_clock.h"
-  export std_private_chrono_steady_clock
-  export std_private_chrono_system_clock
-}
-module std_private_chrono_leap_second            [system] { header "__chrono/leap_second.h" }
-module std_private_chrono_literals               [system] { header "__chrono/literals.h" }
-module std_private_chrono_local_info             [system] {
-  header "__chrono/local_info.h"
-  export std_private_chrono_sys_info
-}
-module std_private_chrono_month                  [system] { header "__chrono/month.h" }
-module std_private_chrono_month_weekday          [system] { header "__chrono/month_weekday.h" }
-module std_private_chrono_monthday               [system] { header "__chrono/monthday.h" }
-module std_private_chrono_ostream                [system] {
-  header "__chrono/ostream.h"
-}
-module std_private_chrono_parser_std_format_spec [system] {
-  header "__chrono/parser_std_format_spec.h"
-}
-module std_private_chrono_statically_widen       [system] { header "__chrono/statically_widen.h" }
-module std_private_chrono_steady_clock           [system] {
-  header "__chrono/steady_clock.h"
-  export std_private_chrono_time_point
-}
-module std_private_chrono_time_zone              [system] {
-  header "__chrono/time_zone.h"
-  export std_private_memory_unique_ptr
-}
-module std_private_chrono_time_zone_link         [system] {
-  header "__chrono/time_zone_link.h"
-}
-module std_private_chrono_sys_info               [system] {
-  header "__chrono/sys_info.h"
-}
-module std_private_chrono_system_clock           [system] {
-  header "__chrono/system_clock.h"
-  export std_private_chrono_time_point
-}
-module std_private_chrono_tzdb                   [system] {
-  header "__chrono/tzdb.h"
-  export *
-}
-module std_private_chrono_tzdb_list              [system] {
-  header "__chrono/tzdb_list.h"
-  export *
-}
-module std_private_chrono_time_point             [system] { header "__chrono/time_point.h" }
-module std_private_chrono_weekday                [system] { header "__chrono/weekday.h" }
-module std_private_chrono_year                   [system] { header "__chrono/year.h" }
-module std_private_chrono_year_month             [system] { header "__chrono/year_month.h" }
-module std_private_chrono_year_month_day         [system] { header "__chrono/year_month_day.h" }
-module std_private_chrono_year_month_weekday     [system] { header "__chrono/year_month_weekday.h" }
-module std_private_chrono_zoned_time             [system] { header "__chrono/zoned_time.h" }
-
-module std_private_compare_common_comparison_category     [system] { header "__compare/common_comparison_category.h" }
-module std_private_compare_compare_partial_order_fallback [system] { header "__compare/compare_partial_order_fallback.h" }
-module std_private_compare_compare_strong_order_fallback  [system] { header "__compare/compare_strong_order_fallback.h" }
-module std_private_compare_compare_three_way              [system] { header "__compare/compare_three_way.h" }
-module std_private_compare_compare_three_way_result       [system] { header "__compare/compare_three_way_result.h" }
-module std_private_compare_compare_weak_order_fallback    [system] { header "__compare/compare_weak_order_fallback.h" }
-module std_private_compare_is_eq                          [system] { header "__compare/is_eq.h" }
-module std_private_compare_ordering                       [system] { header "__compare/ordering.h" }
-module std_private_compare_partial_order                  [system] { header "__compare/partial_order.h" }
-module std_private_compare_strong_order                   [system] { header "__compare/strong_order.h" }
-module std_private_compare_synth_three_way                [system] { header "__compare/synth_three_way.h" }
-module std_private_compare_three_way_comparable           [system] { header "__compare/three_way_comparable.h" }
-module std_private_compare_weak_order                     [system] { header "__compare/weak_order.h" }
-
-module std_private_complex_complex_fwd            [system] { header "__fwd/complex.h" }
-
-module std_private_concepts_arithmetic            [system] { header "__concepts/arithmetic.h" }
-module std_private_concepts_assignable            [system] { header "__concepts/assignable.h" }
-module std_private_concepts_boolean_testable      [system] { header "__concepts/boolean_testable.h" }
-module std_private_concepts_class_or_enum         [system] { header "__concepts/class_or_enum.h" }
-module std_private_concepts_common_reference_with [system] { header "__concepts/common_reference_with.h" }
-module std_private_concepts_common_with           [system] { header "__concepts/common_with.h" }
-module std_private_concepts_constructible         [system] {
-  header "__concepts/constructible.h"
-  export std_private_concepts_destructible
-}
-module std_private_concepts_convertible_to        [system] { header "__concepts/convertible_to.h" }
-module std_private_concepts_copyable              [system] { header "__concepts/copyable.h" }
-module std_private_concepts_derived_from          [system] { header "__concepts/derived_from.h" }
-module std_private_concepts_destructible          [system] {
-  header "__concepts/destructible.h"
-  export std_private_type_traits_is_nothrow_destructible
-}
-module std_private_concepts_different_from        [system] { header "__concepts/different_from.h" }
-module std_private_concepts_equality_comparable   [system] {
-  header "__concepts/equality_comparable.h"
-  export std_private_type_traits_common_reference
-}
-module std_private_concepts_invocable             [system] { header "__concepts/invocable.h" }
-module std_private_concepts_movable               [system] {
-  header "__concepts/movable.h"
-  export std_private_type_traits_is_object
-}
-module std_private_concepts_predicate             [system] { header "__concepts/predicate.h" }
-module std_private_concepts_regular               [system] { header "__concepts/regular.h" }
-module std_private_concepts_relation              [system] { header "__concepts/relation.h" }
-module std_private_concepts_same_as               [system] {
-  header "__concepts/same_as.h"
-  export std_private_type_traits_is_same
-}
-module std_private_concepts_semiregular           [system] { header "__concepts/semiregular.h" }
-module std_private_concepts_swappable             [system] { header "__concepts/swappable.h" }
-module std_private_concepts_totally_ordered       [system] { header "__concepts/totally_ordered.h" }
-
-module std_private_debug_utils_randomize_range            [system] { header "__debug_utils/randomize_range.h" }
-module std_private_debug_utils_sanitizers                 [system] { header "__debug_utils/sanitizers.h" }
-module std_private_debug_utils_strict_weak_ordering_check [system] {
-  header "__debug_utils/strict_weak_ordering_check.h"
-  export std_private_type_traits_is_constant_evaluated
-}
+  // Experimental C++ Standard Library interfaces
+  module experimental {
+    header "experimental/iterator"
+    header "experimental/memory"
+    header "experimental/propagate_const"
+    header "experimental/type_traits"
+    header "experimental/utility"
+    textual header "experimental/__config"
+    module simd {
+      private header "experimental/__simd/aligned_tag.h"
+      private header "experimental/__simd/declaration.h"
+      private header "experimental/__simd/reference.h"
+      private header "experimental/__simd/scalar.h"
+      private header "experimental/__simd/simd_mask.h"
+      private header "experimental/__simd/simd.h"
+      private header "experimental/__simd/traits.h"
+      private header "experimental/__simd/utility.h"
+      private header "experimental/__simd/vec_ext.h"
+      header "experimental/simd"
+      export *
+    }
+    export *
+  }
 
-module std_private_deque_fwd [system] { header "__fwd/deque.h" }
+  // Implementation detail headers that are private to libc++. These modules
+  // must not be directly imported.
+  module debug_utils {
+    header "__debug_utils/randomize_range.h"
+    header "__debug_utils/sanitizers.h"
+    header "__debug_utils/strict_weak_ordering_check.h"
+    export *
+  }
 
-module std_private_exception_exception        [system] { header "__exception/exception.h" }
-module std_private_exception_exception_ptr    [system] {
-  header "__exception/exception_ptr.h"
-  export std_private_exception_operations
-}
-module std_private_exception_nested_exception [system] { header "__exception/nested_exception.h" }
-module std_private_exception_operations       [system] { header "__exception/operations.h" }
-module std_private_exception_terminate        [system] { header "__exception/terminate.h" }
-
-module std_private_expected_bad_expected_access [system] { header "__expected/bad_expected_access.h" }
-module std_private_expected_expected            [system] { header "__expected/expected.h" }
-module std_private_expected_unexpect            [system] { header "__expected/unexpect.h" }
-module std_private_expected_unexpected          [system] { header "__expected/unexpected.h" }
-
-module std_private_format_buffer                          [system] { header "__format/buffer.h" }
-module std_private_format_concepts                        [system] { header "__format/concepts.h" }
-module std_private_format_container_adaptor               [system] { header "__format/container_adaptor.h" }
-module std_private_format_enable_insertable               [system] { header "__format/enable_insertable.h" }
-module std_private_format_escaped_output_table            [system] { header "__format/escaped_output_table.h" }
-module std_private_format_extended_grapheme_cluster_table [system] { header "__format/extended_grapheme_cluster_table.h" }
-module std_private_format_format_arg                      [system] { header "__format/format_arg.h" }
-module std_private_format_format_arg_store                [system] { header "__format/format_arg_store.h" }
-module std_private_format_format_args                     [system] { header "__format/format_args.h" }
-module std_private_format_format_context                  [system] {
-  header "__format/format_context.h"
+  module pstl {
+    header "__pstl/backend.h"
+    header "__pstl/backend_fwd.h"
+    header "__pstl/backends/default.h"
+    header "__pstl/backends/libdispatch.h"
+    header "__pstl/backends/serial.h"
+    header "__pstl/backends/std_thread.h"
+    header "__pstl/cpu_algos/any_of.h"
+    header "__pstl/cpu_algos/cpu_traits.h"
+    header "__pstl/cpu_algos/fill.h"
+    header "__pstl/cpu_algos/find_if.h"
+    header "__pstl/cpu_algos/for_each.h"
+    header "__pstl/cpu_algos/merge.h"
+    header "__pstl/cpu_algos/stable_sort.h"
+    header "__pstl/cpu_algos/transform.h"
+    header "__pstl/cpu_algos/transform_reduce.h"
+    header "__pstl/dispatch.h"
+    header "__pstl/handle_exception.h"
+    export *
+  }
+
+  module miscellaneous {
+    header "__bit_reference"
+    header "__fwd/bit_reference.h"
+    header "__hash_table"
+    header "__node_handle"
+    header "__split_buffer"
+    header "__std_mbstate_t.h"
+    header "__tree"
+    header "__verbose_abort"
+    export *
+  }
----------------
philnik777 wrote:

I think we should just make `std` level modules for these individually. There doesn't seem much reason to put them together.

https://github.com/llvm/llvm-project/pull/107638


More information about the libcxx-commits mailing list