Merge pull request swiftlang#60722 from apple/egorzhdan/libstdcxx-headers

[cxx-interop] Move included stdlib headers from libstdcxx.h to the modulemap

Author: egorzhdan

stdlib/public/Cxx/std/libstdcxx.h

@@ -1,55 +1,3 @@
-#include "algorithm"
-#include "bitset"
-#include "complex"
-#include "deque"
-#include "exception"
-#include "fstream"
-#include "functional"
-#include "iomanip"
-#include "ios"
-#include "iosfwd"
-#include "iostream"
-#include "istream"
-#include "iterator"
-#include "limits"
-#include "list"
-#include "locale"
-#include "map"
-#include "memory"
-#include "new"
-#include "numeric"
-#include "ostream"
-#include "queue"
-#include "set"
-#include "sstream"
-#include "stack"
-#include "stdexcept"
-#include "streambuf"
-#include "string"
-#include "utility"
-#include "typeinfo"
-#include "valarray"
-#include "vector"
-#include "array"
-#include "atomic"
-#include "chrono"
-#include "condition_variable"
-#include "forward_list"
-#include "future"
-#include "initializer_list"
-#include "mutex"
-#include "random"
-#include "ratio"
-#include "regex"
-#include "scoped_allocator"
-#include "system_error"
-#include "thread"
-#include "tuple"
-#include "typeindex"
-#include "type_traits"
-#include "unordered_map"
-#include "unordered_set"
-
 // libstdc++ 4.8.5 bundled with CentOS 7 does not include corecvt.
 #if __has_include("codecvt")
 #include "codecvt"

stdlib/public/Cxx/std/libstdcxx.modulemap

@@ -18,6 +18,59 @@
 
 module std {
   header "libstdcxx.h"
+
+  header "algorithm"
+  header "bitset"
+  header "complex"
+  header "deque"
+  header "exception"
+  header "fstream"
+  header "functional"
+  header "iomanip"
+  header "ios"
+  header "iosfwd"
+  header "iostream"
+  header "istream"
+  header "iterator"
+  header "limits"
+  header "list"
+  header "locale"
+  header "map"
+  header "memory"
+  header "new"
+  header "numeric"
+  header "ostream"
+  header "queue"
+  header "set"
+  header "sstream"
+  header "stack"
+  header "stdexcept"
+  header "streambuf"
+  header "string"
+  header "utility"
+  header "typeinfo"
+  header "valarray"
+  header "vector"
+  header "array"
+  header "atomic"
+  header "chrono"
+  header "condition_variable"
+  header "forward_list"
+  header "future"
+  header "initializer_list"
+  header "mutex"
+  header "random"
+  header "ratio"
+  header "regex"
+  header "scoped_allocator"
+  header "system_error"
+  header "thread"
+  header "tuple"
+  header "typeindex"
+  header "type_traits"
+  header "unordered_map"
+  header "unordered_set"
+
   requires cplusplus
   export *