This is an archive of the discontinued LLVM Phabricator instance.

Differential D118925

[libc++][format][nfc] Header cleanup.
ClosedPublic

Authored by Mordante on Feb 3 2022, 10:25 AM.

Details

Reviewers
• Quuxplusone
ldionne
philnik
Group Reviewers
Restricted Project
Commits
rG11e4001ba2b4: [libc++][format][nfc] Header cleanup.
Summary

Remove the unneeded macro protection, forward declarations, and
includes.

Diff Detail

Unit TestsFailed

TimeTest
3,590 mslibcxx CI C++20 > llvm-libc++-shared-cfg-in.libcxx::min_max_macros.compile.pass.cpp
4,870 mslibcxx CI C++2b > llvm-libc++-shared-cfg-in.libcxx::min_max_macros.compile.pass.cpp
3,870 mslibcxx CI GCC 11 / C++latest > llvm-libc++-shared-gcc-cfg-in.libcxx::min_max_macros.compile.pass.cpp

Event Timeline

Mordante requested review of this revision.Feb 3 2022, 10:25 AM
Mordante created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 3 2022, 10:25 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
• Quuxplusone accepted this revision as: • Quuxplusone.Feb 3 2022, 11:01 AM
• Quuxplusone added a subscriber: • Quuxplusone.

If CI's happy, I'm happy.

libcxx/include/__format/formatter.h
21

Maybe also replace this include with more granular includes while you're at it?

Harbormaster completed remote builds in B147443: Diff 405704.Feb 3 2022, 11:36 AM
ldionne accepted this revision.Feb 3 2022, 12:28 PM
This revision is now accepted and ready to land.Feb 3 2022, 12:28 PM
Mordante updated this revision to Diff 406046.Feb 4 2022, 11:01 AM

There are other min's than _VSTD::min that need to be guarded.

Harbormaster completed remote builds in B147681: Diff 406046.Feb 4 2022, 11:57 AM
philnik accepted this revision.Feb 4 2022, 12:47 PM
Mordante marked an inline comment as done.Feb 8 2022, 8:51 AM
Mordante added inline comments.
libcxx/include/__format/formatter.h
21

That's hard; it seems the header is no longer needed. So deleted it instead :-)

Mordante updated this revision to Diff 406862.Feb 8 2022, 8:51 AM
Mordante marked an inline comment as done.

Addresses review comments.

Harbormaster completed remote builds in B148275: Diff 406862.Feb 8 2022, 11:12 AM
Closed by commit rG11e4001ba2b4: [libc++][format][nfc] Header cleanup. (authored by Mordante). · Explain WhyFeb 9 2022, 8:12 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rG11e4001ba2b4: [libc++][format][nfc] Header cleanup..

Revision Contents

PathSize
libcxx/
include/
__format/
5 lines
5 lines
5 lines
11 lines
5 lines
5 lines
5 lines
5 lines

Diff 405704

libcxx/include/__format/format_arg.h

Show All 19 Lines
#include <__variant/monostate.h> #include <__variant/monostate.h>
#include <string> #include <string>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 243 Lines • ▼ Show 20 Lines
}; };
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMAT_ARG_H #endif // _LIBCPP___FORMAT_FORMAT_ARG_H

libcxx/include/__format/format_args.h

Show All 13 Lines
#include <__config> #include <__config>
#include <__format/format_fwd.h> #include <__format/format_fwd.h>
#include <cstddef> #include <cstddef>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
Show All 28 Lines
}; };
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMAT_ARGS_H #endif // _LIBCPP___FORMAT_FORMAT_ARGS_H

libcxx/include/__format/format_context.h

Show All 21 Lines
#include <locale> #include <locale>
#include <optional> #include <optional>
#endif #endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
}; };
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMAT_CONTEXT_H #endif // _LIBCPP___FORMAT_FORMAT_CONTEXT_H

libcxx/include/__format/format_fwd.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_FORMAT_FWD_H #ifndef _LIBCPP___FORMAT_FORMAT_FWD_H
#define _LIBCPP___FORMAT_FORMAT_FWD_H #define _LIBCPP___FORMAT_FORMAT_FWD_H
#include <__availability> #include <__availability>
#include <__config> #include <__config>
#include <__iterator/concepts.h>
#include <__utility/forward.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) #if !defined(_LIBCPP_HAS_NO_CONCEPTS)
template <class _Context> template <class _Context>
class _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT basic_format_arg; class _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT basic_format_arg;
template <class _Context, class... _Args> template <class _Context, class... _Args>
struct _LIBCPP_TEMPLATE_VIS __format_arg_store; struct _LIBCPP_TEMPLATE_VIS __format_arg_store;
template <class _Ctx, class... _Args>
_LIBCPP_HIDE_FROM_ABI __format_arg_store<_Ctx, _Args...>
make_format_args(const _Args&...);
template <class _Tp, class _CharT = char> template <class _Tp, class _CharT = char>
struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter; struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter;
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMAT_FWD_H #endif // _LIBCPP___FORMAT_FORMAT_FWD_H

libcxx/include/__format/formatter.h

Show All 12 Lines
#include <__algorithm/copy.h> #include <__algorithm/copy.h>
#include <__algorithm/fill_n.h> #include <__algorithm/fill_n.h>
#include <__availability> #include <__availability>
#include <__config> #include <__config>
#include <__format/format_error.h> #include <__format/format_error.h>
#include <__format/format_fwd.h> #include <__format/format_fwd.h>
#include <__format/format_string.h> #include <__format/format_string.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <concepts> #include <concepts>
QuuxplusoneUnsubmitted
Done
ReplyInline Actions

Maybe also replace this include with more granular includes while you're at it?

Quuxplusone: Maybe also replace this include with more granular includes while you're at it?
MordanteAuthorUnsubmitted
Done
ReplyInline Actions

That's hard; it seems the header is no longer needed. So deleted it instead :-)

Mordante: That's hard; it seems the header is no longer needed. So deleted it instead :-)
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 241 Lines • ▼ Show 20 Lines
} // namespace __formatter } // namespace __formatter
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMATTER_H #endif // _LIBCPP___FORMAT_FORMATTER_H

libcxx/include/__format/formatter_integer.h

Show All 17 Lines
#include <__format/formatter_integral.h> #include <__format/formatter_integral.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <limits> #include <limits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 123 Lines • ▼ Show 20 Lines
#endif #endif
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMATTER_INTEGER_H #endif // _LIBCPP___FORMAT_FORMATTER_INTEGER_H

libcxx/include/__format/formatter_string.h

Show All 16 Lines
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 116 Lines • ▼ Show 20 Lines
}; };
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___FORMAT_FORMATTER_STRING_H #endif // _LIBCPP___FORMAT_FORMATTER_STRING_H

libcxx/include/format

Show First 20 Lines • Show All 149 Lines • ▼ Show 20 Lines
#ifndef _LIBCPP_HAS_NO_LOCALIZATION #ifndef _LIBCPP_HAS_NO_LOCALIZATION
#include <locale> #include <locale>
#endif #endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
// TODO FMT Remove this once we require compilers with proper C++20 support. // TODO FMT Remove this once we require compilers with proper C++20 support.
// If the compiler has no concepts support, the format header will be disabled. // If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort // Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support. // to support compilers with partial C++20 support.
▲ Show 20 Lines • Show All 383 Lines • ▼ Show 20 Lines
#endif // _LIBCPP_HAS_NO_LOCALIZATION #endif // _LIBCPP_HAS_NO_LOCALIZATION
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17 #endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT) #endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
#endif // _LIBCPP_FORMAT #endif // _LIBCPP_FORMAT