Skip to content

Commit 72a006b

Browse files
[libc++][Modules] Remove unnecessary requires from the module map
Top level modules don't need `requires` because they're only built when their headers are included. Reviewed By: ldionne, Mordante, #libc Differential Revision: https://reviews.llvm.org/D157363
1 parent 1ef3de6 commit 72a006b

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

libcxx/include/module.modulemap.in

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module std_atomic [system] {
1616
export *
1717
}
1818
module std_barrier [system] {
19-
@requires_LIBCXX_ENABLE_THREADS@
2019
header "barrier"
2120
export *
2221
}
@@ -37,7 +36,6 @@ module std_chrono [system] {
3736
export *
3837
}
3938
module std_codecvt [system] {
40-
@requires_LIBCXX_ENABLE_LOCALIZATION@
4139
header "codecvt"
4240
export *
4341
}
@@ -78,7 +76,6 @@ module std_expected [system] {
7876
export *
7977
}
8078
module std_filesystem [system] {
81-
@requires_LIBCXX_ENABLE_FILESYSTEM@
8279
header "filesystem"
8380
export *
8481
}
@@ -91,8 +88,6 @@ module std_forward_list [system] {
9188
export *
9289
}
9390
module std_fstream [system] {
94-
@requires_LIBCXX_ENABLE_LOCALIZATION@
95-
@requires_LIBCXX_ENABLE_FILESYSTEM@
9691
header "fstream"
9792
export *
9893
}
@@ -101,7 +96,6 @@ module std_functional [system] {
10196
export *
10297
}
10398
module std_future [system] {
104-
@requires_LIBCXX_ENABLE_THREADS@
10599
header "future"
106100
export *
107101
}
@@ -110,12 +104,10 @@ module std_initializer_list [system] {
110104
export *
111105
}
112106
module std_iomanip [system] {
113-
@requires_LIBCXX_ENABLE_LOCALIZATION@
114107
header "iomanip"
115108
export *
116109
}
117110
module std_ios [system] {
118-
@requires_LIBCXX_ENABLE_LOCALIZATION@
119111
header "ios"
120112
export *
121113
}
@@ -124,12 +116,10 @@ module std_iosfwd [system] {
124116
export *
125117
}
126118
module std_iostream [system] {
127-
@requires_LIBCXX_ENABLE_LOCALIZATION@
128119
header "iostream"
129120
export *
130121
}
131122
module std_istream [system] {
132-
@requires_LIBCXX_ENABLE_LOCALIZATION@
133123
header "istream"
134124
export *
135125
}
@@ -138,7 +128,6 @@ module std_iterator [system] {
138128
export *
139129
}
140130
module std_latch [system] {
141-
@requires_LIBCXX_ENABLE_THREADS@
142131
header "latch"
143132
export *
144133
}
@@ -151,7 +140,6 @@ module std_list [system] {
151140
export *
152141
}
153142
module std_locale [system] {
154-
@requires_LIBCXX_ENABLE_LOCALIZATION@
155143
header "locale"
156144
export *
157145
}
@@ -192,7 +180,6 @@ module std_optional [system] {
192180
export *
193181
}
194182
module std_ostream [system] {
195-
@requires_LIBCXX_ENABLE_LOCALIZATION@
196183
header "ostream"
197184
export *
198185
}
@@ -217,7 +204,6 @@ module std_ratio [system] {
217204
export *
218205
}
219206
module std_regex [system] {
220-
@requires_LIBCXX_ENABLE_LOCALIZATION@
221207
header "regex"
222208
export *
223209
}
@@ -226,7 +212,6 @@ module std_scoped_allocator [system] {
226212
export *
227213
}
228214
module std_semaphore [system] {
229-
@requires_LIBCXX_ENABLE_THREADS@
230215
header "semaphore"
231216
export *
232217
}
@@ -235,7 +220,6 @@ module std_set [system] {
235220
export *
236221
}
237222
module std_shared_mutex [system] {
238-
@requires_LIBCXX_ENABLE_THREADS@
239223
header "shared_mutex"
240224
export std_version
241225
}
@@ -250,7 +234,6 @@ module std_span [system] {
250234
export std_private_span_span_fwd
251235
}
252236
module std_sstream [system] {
253-
@requires_LIBCXX_ENABLE_LOCALIZATION@
254237
header "sstream"
255238
export *
256239
}
@@ -263,12 +246,10 @@ module std_stdexcept [system] {
263246
export *
264247
}
265248
module std_stop_token {
266-
@requires_LIBCXX_ENABLE_THREADS@
267249
header "stop_token"
268250
export *
269251
}
270252
module std_streambuf [system] {
271-
@requires_LIBCXX_ENABLE_LOCALIZATION@
272253
header "streambuf"
273254
export *
274255
}
@@ -281,7 +262,6 @@ module std_string_view [system] {
281262
export *
282263
}
283264
module std_strstream [system] {
284-
@requires_LIBCXX_ENABLE_LOCALIZATION@
285265
header "strstream"
286266
export *
287267
}
@@ -290,7 +270,6 @@ module std_system_error [system] {
290270
export *
291271
}
292272
module std_thread [system] {
293-
@requires_LIBCXX_ENABLE_THREADS@
294273
header "thread"
295274
export *
296275
}
@@ -377,7 +356,6 @@ module std_climits [system] {
377356
export *
378357
}
379358
module std_clocale [system] {
380-
@requires_LIBCXX_ENABLE_LOCALIZATION@
381359
header "clocale"
382360
export *
383361
}
@@ -435,12 +413,10 @@ module std_cuchar [system] {
435413
export *
436414
}
437415
module std_cwchar [system] {
438-
@requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
439416
header "cwchar"
440417
export *
441418
}
442419
module std_cwctype [system] {
443-
@requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
444420
header "cwctype"
445421
export *
446422
}
@@ -477,7 +453,6 @@ module std_limits_h [system] {
477453
export *
478454
}
479455
module std_locale_h [system] {
480-
@requires_LIBCXX_ENABLE_LOCALIZATION@
481456
header "locale.h"
482457
export *
483458
}
@@ -493,8 +468,6 @@ module std_setjmp_h [system] {
493468
// FIXME: <stdalign.h> is missing.
494469
// <stdarg.h> provided by compiler.
495470
module std_stdatomic_h [system] {
496-
@requires_LIBCXX_ENABLE_THREADS@
497-
requires cplusplus23
498471
header "stdatomic.h"
499472
export *
500473
}
@@ -536,21 +509,17 @@ module std_uchar_h [system] {
536509
}
537510
// <time.h> provided by C library.
538511
module std_wchar_h [system] {
539-
@requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
540512
// <wchar.h>'s __need_* macros require textual inclusion.
541513
textual header "wchar.h"
542514
export *
543515
}
544516
module std_wctype_h [system] {
545-
@requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
546517
header "wctype.h"
547518
export *
548519
}
549520

550521
// Experimental C++ standard library interfaces
551522
module std_experimental [system] {
552-
requires cplusplus11
553-
554523
module deque {
555524
header "experimental/deque"
556525
export *
@@ -657,7 +626,6 @@ module std_private_hash_table [system] {
657626
export *
658627
}
659628
module std_private_locale [system] {
660-
@requires_LIBCXX_ENABLE_LOCALIZATION@
661629
header "__locale"
662630
export *
663631
}
@@ -1196,7 +1164,6 @@ module std_private_chrono_duration [system] {
11961164
}
11971165
module std_private_chrono_file_clock [system] { header "__chrono/file_clock.h" }
11981166
module std_private_chrono_formatter [system] {
1199-
@requires_LIBCXX_ENABLE_LOCALIZATION@
12001167
header "__chrono/formatter.h"
12011168
}
12021169
module std_private_chrono_hh_mm_ss [system] { header "__chrono/hh_mm_ss.h" }
@@ -1210,11 +1177,9 @@ module std_private_chrono_month [system] { header "__chrono/mon
12101177
module std_private_chrono_month_weekday [system] { header "__chrono/month_weekday.h" }
12111178
module std_private_chrono_monthday [system] { header "__chrono/monthday.h" }
12121179
module std_private_chrono_ostream [system] {
1213-
@requires_LIBCXX_ENABLE_LOCALIZATION@
12141180
header "__chrono/ostream.h"
12151181
}
12161182
module std_private_chrono_parser_std_format_spec [system] {
1217-
@requires_LIBCXX_ENABLE_LOCALIZATION@
12181183
header "__chrono/parser_std_format_spec.h"
12191184
}
12201185
module std_private_chrono_statically_widen [system] { header "__chrono/statically_widen.h" }
@@ -1719,7 +1684,6 @@ module std_private_ranges_filter_view [system] {
17191684
module std_private_ranges_from_range [system] { header "__ranges/from_range.h" }
17201685
module std_private_ranges_iota_view [system] { header "__ranges/iota_view.h" }
17211686
module std_private_ranges_istream_view [system] {
1722-
@requires_LIBCXX_ENABLE_LOCALIZATION@
17231687
header "__ranges/istream_view.h"
17241688
}
17251689
module std_private_ranges_join_view [system] {

0 commit comments

Comments
 (0)