[libc++] Improves modular build.

[Mordante]

Summary

Makes sure headers having a xxx_result as return type export the proper
header. Without exporting these modularized headers are not self
contained.

This is related to D136045.

[ldionne]

Per live discussion, these issues were found in one of @Mordante 's WIP patch for format/ranges support. Hence, this would trigger errors with our existing tests, and no additional testing is really necessary.

libcxx/include/__format/formatter_output.h

1

Not attached: there's a typo in the commit message Makes sure headers having a xxx_resul as return type export the proper.

libcxx/include/__format/formatter_output.h

 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
 #define _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
 
-#include <__algorithm/in_out_result.h>
 #include <__algorithm/ranges_copy.h>
 #include <__algorithm/ranges_fill_n.h>
 #include <__algorithm/ranges_transform.h>
 #include <__chrono/statically_widen.h>
 #include <__concepts/same_as.h>
 #include <__config>
 #include <__format/buffer.h>
 #include <__format/concepts.h>

libcxx/include/__ranges/lazy_split_view.h

 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
 #define _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
 
-#include <__algorithm/in_in_result.h>
 #include <__algorithm/ranges_find.h>
 #include <__algorithm/ranges_mismatch.h>
 #include <__concepts/constructible.h>
 #include <__concepts/convertible_to.h>
 #include <__concepts/derived_from.h>
 #include <__config>
 #include <__functional/bind_back.h>
 #include <__functional/ranges_operations.h>

libcxx/include/module.modulemap.in

module __algorithm {
       module ranges_binary_search {
         private header "__algorithm/ranges_binary_search.h"
         export functional.__functional.ranges_operations
       }
       module ranges_clamp {
         private header "__algorithm/ranges_clamp.h"
         export functional.__functional.ranges_operations
       }
-      module ranges_copy                     { private header "__algorithm/ranges_copy.h" }
-      module ranges_copy_backward            { private header "__algorithm/ranges_copy_backward.h" }
-      module ranges_copy_if                  { private header "__algorithm/ranges_copy_if.h" }
-      module ranges_copy_n                   { private header "__algorithm/ranges_copy_n.h" }
+      module ranges_copy {
+        private header "__algorithm/ranges_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_backward {
+        private header "__algorithm/ranges_copy_backward.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_if {
+        private header "__algorithm/ranges_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_n {
+        private header "__algorithm/ranges_copy_n.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_count                    { private header "__algorithm/ranges_count.h" }
       module ranges_count_if                 { private header "__algorithm/ranges_count_if.h" }
       module ranges_equal                    { private header "__algorithm/ranges_equal.h" }
       module ranges_equal_range {
         private header "__algorithm/ranges_equal_range.h"
         export functional.__functional.ranges_operations
       }
       module ranges_fill                     { private header "__algorithm/ranges_fill.h" }
       module ranges_fill_n                   { private header "__algorithm/ranges_fill_n.h" }
       module ranges_find                     { private header "__algorithm/ranges_find.h" }
       module ranges_find_end                 { private header "__algorithm/ranges_find_end.h" }
       module ranges_find_first_of            { private header "__algorithm/ranges_find_first_of.h" }
       module ranges_find_if                  { private header "__algorithm/ranges_find_if.h" }
       module ranges_find_if_not              { private header "__algorithm/ranges_find_if_not.h" }
-      module ranges_for_each                 { private header "__algorithm/ranges_for_each.h" }
-      module ranges_for_each_n               { private header "__algorithm/ranges_for_each_n.h" }
+      module ranges_for_each {
+        private header "__algorithm/ranges_for_each.h"
+        export algorithm.__algorithm.in_fun_result
+      }
+      module ranges_for_each_n {
+        private header "__algorithm/ranges_for_each_n.h"
+        export algorithm.__algorithm.in_fun_result
+      }
       module ranges_generate                 { private header "__algorithm/ranges_generate.h" }
       module ranges_generate_n               { private header "__algorithm/ranges_generate_n.h" }
       module ranges_includes {
         private header "__algorithm/ranges_includes.h"
         export functional.__functional.ranges_operations
       }
       module ranges_inplace_merge {
         private header "__algorithm/ranges_inplace_merge.h"
module __algorithm {
       module ranges_max {
         private header "__algorithm/ranges_max.h"
         export functional.__functional.ranges_operations
       }
       module ranges_max_element {
         private header "__algorithm/ranges_max_element.h"
         export functional.__functional.ranges_operations
       }
-      module ranges_merge                    { private header "__algorithm/ranges_merge.h" }
+      module ranges_merge {
+        private header "__algorithm/ranges_merge.h"
+        export algorithm.__algorithm.in_in_out_result
+      }
       module ranges_min {
         private header "__algorithm/ranges_min.h"
         export functional.__functional.ranges_operations
       }
       module ranges_min_element {
         private header "__algorithm/ranges_min_element.h"
         export functional.__functional.ranges_operations
       }
       module ranges_minmax {
         private header "__algorithm/ranges_minmax.h"
         export functional.__functional.ranges_operations
+        export algorithm.__algorithm.min_max_result
       }
       module ranges_minmax_element {
         private header "__algorithm/ranges_minmax_element.h"
         export functional.__functional.ranges_operations
+        export algorithm.__algorithm.min_max_result
+      }
+      module ranges_mismatch {
+        private header "__algorithm/ranges_mismatch.h"
+        export algorithm.__algorithm.in_in_result
+      }
+      module ranges_move {
+        private header "__algorithm/ranges_move.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_move_backward {
+        private header "__algorithm/ranges_move_backward.h"
+        export algorithm.__algorithm.in_out_result
       }
-      module ranges_mismatch                 { private header "__algorithm/ranges_mismatch.h" }
-      module ranges_move                     { private header "__algorithm/ranges_move.h" }
-      module ranges_move_backward            { private header "__algorithm/ranges_move_backward.h" }
       module ranges_next_permutation {
         private header "__algorithm/ranges_next_permutation.h"
+        export algorithm.__algorithm.in_found_result
         export functional.__functional.ranges_operations
       }
       module ranges_none_of                  { private header "__algorithm/ranges_none_of.h" }
       module ranges_nth_element {
         private header "__algorithm/ranges_nth_element.h"
         export functional.__functional.ranges_operations
       }
       module ranges_partial_sort {
         private header "__algorithm/ranges_partial_sort.h"
+        export algorithm.__algorithm.in_out_result
         export functional.__functional.ranges_operations
       }
       module ranges_partial_sort_copy {
         private header "__algorithm/ranges_partial_sort_copy.h"
+        export algorithm.__algorithm.in_out_out_result
         export functional.__functional.ranges_operations
       }
       module ranges_partition                { private header "__algorithm/ranges_partition.h" }
       module ranges_partition_copy           { private header "__algorithm/ranges_partition_copy.h" }
       module ranges_partition_point          { private header "__algorithm/ranges_partition_point.h" }
       module ranges_pop_heap {
         private header "__algorithm/ranges_pop_heap.h"
         export functional.__functional.ranges_operations
       }
       module ranges_prev_permutation {
         private header "__algorithm/ranges_prev_permutation.h"
+        export algorithm.__algorithm.in_found_result
         export functional.__functional.ranges_operations
       }
       module ranges_push_heap {
         private header "__algorithm/ranges_push_heap.h"
         export functional.__functional.ranges_operations
       }
       module ranges_remove                   { private header "__algorithm/ranges_remove.h" }
-      module ranges_remove_copy              { private header "__algorithm/ranges_remove_copy.h" }
-      module ranges_remove_copy_if           { private header "__algorithm/ranges_remove_copy_if.h" }
+      module ranges_remove_copy {
+        private header "__algorithm/ranges_remove_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_remove_copy_if {
+        private header "__algorithm/ranges_remove_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_remove_if                { private header "__algorithm/ranges_remove_if.h" }
       module ranges_replace                  { private header "__algorithm/ranges_replace.h" }
-      module ranges_replace_copy             { private header "__algorithm/ranges_replace_copy.h" }
-      module ranges_replace_copy_if          { private header "__algorithm/ranges_replace_copy_if.h" }
+      module ranges_replace_copy {
+        private header "__algorithm/ranges_replace_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_replace_copy_if {
+        private header "__algorithm/ranges_replace_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_replace_if               { private header "__algorithm/ranges_replace_if.h" }
       module ranges_reverse                  { private header "__algorithm/ranges_reverse.h" }
-      module ranges_reverse_copy             { private header "__algorithm/ranges_reverse_copy.h" }
+      module ranges_reverse_copy {
+        private header "__algorithm/ranges_reverse_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_rotate                   { private header "__algorithm/ranges_rotate.h" }
-      module ranges_rotate_copy              { private header "__algorithm/ranges_rotate_copy.h" }
+      module ranges_rotate_copy {
+        private header "__algorithm/ranges_rotate_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_sample                   { private header "__algorithm/ranges_sample.h" }
       module ranges_search                   { private header "__algorithm/ranges_search.h" }
       module ranges_search_n                 { private header "__algorithm/ranges_search_n.h" }
-      module ranges_set_difference           { private header "__algorithm/ranges_set_difference.h" }
-      module ranges_set_intersection         { private header "__algorithm/ranges_set_intersection.h" }
+      module ranges_set_difference {
+        private header "__algorithm/ranges_set_difference.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_set_intersection {
+        private header "__algorithm/ranges_set_intersection.h"
+        export algorithm.__algorithm.in_in_out_result
+      }
       module ranges_set_symmetric_difference {
         private header "__algorithm/ranges_set_symmetric_difference.h"
+        export algorithm.__algorithm.in_in_out_result
         export functional.__functional.ranges_operations
       }
       module ranges_set_union {
-         private header "__algorithm/ranges_set_union.h"
+        export algorithm.__algorithm.in_in_out_result
         export functional.__functional.ranges_operations
       }
       module ranges_shuffle                  { private header "__algorithm/ranges_shuffle.h" }
       module ranges_sort {
         private header "__algorithm/ranges_sort.h"
         export functional.__functional.ranges_operations
       }
       module ranges_sort_heap {
         private header "__algorithm/ranges_sort_heap.h"
         export functional.__functional.ranges_operations
       }
       module ranges_stable_partition         { private header "__algorithm/ranges_stable_partition.h" }
       module ranges_stable_sort {
         private header "__algorithm/ranges_stable_sort.h"
         export functional.__functional.ranges_operations
       }
-      module ranges_swap_ranges              { private header "__algorithm/ranges_swap_ranges.h" }
-      module ranges_transform                { private header "__algorithm/ranges_transform.h" }
+      module ranges_swap_ranges {
+        private header "__algorithm/ranges_swap_ranges.h"
+        export algorithm.__algorithm.in_in_result
+      }
+      module ranges_transform {
+        private header "__algorithm/ranges_transform.h"
+        export algorithm.__algorithm.in_in_out_result
+        export algorithm.__algorithm.in_out_result
+      }
       module uniform_random_bit_generator_adaptor {
         private header "__algorithm/uniform_random_bit_generator_adaptor.h"
       }
       module ranges_unique                   { private header "__algorithm/ranges_unique.h" }
-      module ranges_unique_copy              { private header "__algorithm/ranges_unique_copy.h" }
+      module ranges_unique_copy {
+        private header "__algorithm/ranges_unique_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module ranges_upper_bound {
         private header "__algorithm/ranges_upper_bound.h"
         export functional.__functional.ranges_operations
       }
       module remove                          { private header "__algorithm/remove.h" }
       module remove_copy                     { private header "__algorithm/remove_copy.h" }
       module remove_copy_if                  { private header "__algorithm/remove_copy_if.h" }
       module remove_if                       { private header "__algorithm/remove_if.h" }
module __memory {
       module auto_ptr                        { private header "__memory/auto_ptr.h" }
       module builtin_new_allocator           { private header "__memory/builtin_new_allocator.h" }
       module compressed_pair                 { private header "__memory/compressed_pair.h" }
       module concepts                        { private header "__memory/concepts.h" }
       module construct_at                    { private header "__memory/construct_at.h" }
       module destruct_n                      { private header "__memory/destruct_n.h" }
       module pointer_traits                  { private header "__memory/pointer_traits.h" }
       module ranges_construct_at             { private header "__memory/ranges_construct_at.h" }
-      module ranges_uninitialized_algorithms { private header "__memory/ranges_uninitialized_algorithms.h" }
+      module ranges_uninitialized_algorithms {
+        private header "__memory/ranges_uninitialized_algorithms.h"
+        export algorithm.__algorithm.in_out_result
+      }
       module raw_storage_iterator            { private header "__memory/raw_storage_iterator.h" }
       module shared_ptr                      { private header "__memory/shared_ptr.h" }
       module swap_allocator                  { private header "__memory/swap_allocator.h" }
       module temp_value                      { private header "__memory/temp_value.h" }
       module temporary_buffer                { private header "__memory/temporary_buffer.h" }
       module uninitialized_algorithms        { private header "__memory/uninitialized_algorithms.h" }
       module unique_ptr                      { private header "__memory/unique_ptr.h" }
       module uses_allocator                  { private header "__memory/uses_allocator.h" }