Skip to content

[libc++][NFC] Move __format/format_fwd.h to __fwd/format.h #84336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2024
Merged

[libc++][NFC] Move __format/format_fwd.h to __fwd/format.h #84336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ set(files
__format/format_context.h
__format/format_error.h
__format/format_functions.h
__format/format_fwd.h
__format/format_parse_context.h
__format/format_string.h
__format/format_to_n_result.h
Expand Down Expand Up @@ -430,6 +429,7 @@ set(files
__fwd/array.h
__fwd/bit_reference.h
__fwd/complex.h
__fwd/format.h
__fwd/fstream.h
__fwd/functional.h
__fwd/ios.h
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__format/concepts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <__concepts/same_as.h>
#include <__concepts/semiregular.h>
#include <__config>
#include <__format/format_fwd.h>
#include <__format/format_parse_context.h>
#include <__fwd/format.h>
#include <__type_traits/is_specialization.h>
#include <__type_traits/remove_const.h>
#include <__utility/pair.h>
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__format/format_arg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include <__concepts/arithmetic.h>
#include <__config>
#include <__format/concepts.h>
#include <__format/format_fwd.h>
#include <__format/format_parse_context.h>
#include <__functional/invoke.h>
#include <__fwd/format.h>
#include <__memory/addressof.h>
#include <__type_traits/conditional.h>
#include <__utility/forward.h>
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__format/format_args.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <__config>
#include <__format/format_arg.h>
#include <__format/format_arg_store.h>
#include <__format/format_fwd.h>
#include <__fwd/format.h>
#include <cstddef>
#include <cstdint>

Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__format/format_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <__format/format_arg_store.h>
#include <__format/format_args.h>
#include <__format/format_error.h>
#include <__format/format_fwd.h>
#include <__fwd/format.h>
#include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h>
#include <__memory/addressof.h>
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__format/formatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <__availability>
#include <__config>
#include <__format/format_fwd.h>
#include <__fwd/format.h>

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
Expand Down
6 changes: 3 additions & 3 deletions libcxx/include/__format/format_fwd.h → libcxx/include/__fwd/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___FORMAT_FORMAT_FWD_H
#define _LIBCPP___FORMAT_FORMAT_FWD_H
#ifndef _LIBCPP___FWD_FORMAT_H
#define _LIBCPP___FWD_FORMAT_H

#include <__availability>
#include <__config>
Expand Down Expand Up @@ -36,4 +36,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___FORMAT_FORMAT_FWD_H
#endif // _LIBCPP___FWD_FORMAT_H
2 changes: 1 addition & 1 deletion libcxx/include/format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ namespace std {
#include <__format/format_context.h>
#include <__format/format_error.h>
#include <__format/format_functions.h>
#include <__format/format_fwd.h>
#include <__format/format_parse_context.h>
#include <__format/format_string.h>
#include <__format/format_to_n_result.h>
Expand All @@ -215,6 +214,7 @@ namespace std {
#include <__format/range_default_formatter.h>
#include <__format/range_formatter.h>
#include <__format/unicode.h>
#include <__fwd/format.h>
#include <version>

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/libcxx.imp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@
{ include: [ "<__format/format_context.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_error.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_functions.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_fwd.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_parse_context.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_string.h>", "private", "<format>", "public" ] },
{ include: [ "<__format/format_to_n_result.h>", "private", "<format>", "public" ] },
Expand Down Expand Up @@ -425,6 +424,7 @@
{ include: [ "<__fwd/bit_reference.h>", "private", "<bitset>", "public" ] },
{ include: [ "<__fwd/bit_reference.h>", "private", "<vector>", "public" ] },
{ include: [ "<__fwd/complex.h>", "private", "<complex>", "public" ] },
{ include: [ "<__fwd/format.h>", "private", "<format>", "public" ] },
{ include: [ "<__fwd/fstream.h>", "private", "<iosfwd>", "public" ] },
{ include: [ "<__fwd/functional.h>", "private", "<functional>", "public" ] },
{ include: [ "<__fwd/ios.h>", "private", "<iosfwd>", "public" ] },
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ module std_private_format_format_functions [system] {
header "__format/format_functions.h"
export std_string
}
module std_private_format_format_fwd [system] { header "__format/format_fwd.h" }
module std_private_format_fwd [system] { header "__fwd/format.h" }
module std_private_format_format_parse_context [system] { header "__format/format_parse_context.h" }
module std_private_format_format_string [system] { header "__format/format_string.h" }
module std_private_format_format_to_n_result [system] {
Expand Down