Skip to content
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

Reduce inclusion for <queue>, <stack>, <stacktrace>, and <thread> #5003

Merged
merged 8 commits into from
Oct 12, 2024
Merged

Reduce inclusion for <queue>, <stack>, <stacktrace>, and <thread> #5003

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0277f64
Reduce inclusion for `<queue>`,`<stack>`,`<stacktrace>`,`<thread>`
frederick-vs-ja Oct 5, 2024
6b60cc1
Templatize `parse`, add missed `_NODISCARD`
frederick-vs-ja Oct 5, 2024
787983e
Comment `formatter<thread::id, _CharT>::parse`.
StephanTLavavej Oct 10, 2024
1fe578c
Further reduce inclusion in `<stacktrace>`.
StephanTLavavej Oct 10, 2024
d3f01b6
Drop `std::`.
StephanTLavavej Oct 10, 2024
cc1b19d
`P2286R8_text_formatting_header_vector` doesn't use `<type_traits>`.
StephanTLavavej Oct 10, 2024
3c6ea6c
Drop `const` for `int _Width` in a function declaration.
StephanTLavavej Oct 10, 2024
b4e758a
Consistently order data members before normal parameters.
StephanTLavavej Oct 10, 2024
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
1 change: 1 addition & 0 deletions stl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ set(HEADERS
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_ostream.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_print.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_ranges_to.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_ranges_tuple_formatter.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_sanitizer_annotate_container.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_string_view.hpp
${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_system_error_abi.hpp
Expand Down
38 changes: 38 additions & 0 deletions stl/inc/__msvc_formatter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,44 @@ constexpr bool enable_nonlocking_formatter_optimization<pair<_Ty1, _Ty2>> =
template <class... _Ts>
constexpr bool enable_nonlocking_formatter_optimization<tuple<_Ts...>> =
(enable_nonlocking_formatter_optimization<_Ts> && ...);

template <class _CharT>
struct _Fill_align_and_width_specs {
int _Width = -1;
int _Dynamic_width_index = -1;
_Fmt_align _Alignment = _Fmt_align::_None;
uint8_t _Fill_length = 1;
// At most one codepoint (so one char32_t or four utf-8 char8_t).
_CharT _Fill[4 / sizeof(_CharT)]{' '};
};

// TRANSITION, VSO-1236041: Avoid declaring and defining member functions in different headers.
template <class _CharT, class _Pc>
_NODISCARD constexpr _Pc::iterator _Fill_align_and_width_formatter_parse(
_Fill_align_and_width_specs<_CharT>& _Specs, _Pc& _Parse_ctx);

template <class _CharT, class _FormatContext, class _Func>
_NODISCARD _FormatContext::iterator _Fill_align_and_width_formatter_format(_FormatContext& _Format_ctx,
const _Fill_align_and_width_specs<_CharT>& _Specs, const int _Width, _Fmt_align _Default_align, _Func&& _Fn);

template <class _CharT>
struct _Fill_align_and_width_formatter {
public:
template <class _ParseContext = basic_format_parse_context<_CharT>> // improves throughput, see GH-5003
_NODISCARD constexpr _ParseContext::iterator _Parse(type_identity_t<_ParseContext&> _Parse_ctx) {
return _STD _Fill_align_and_width_formatter_parse(_Specs, _Parse_ctx);
}

template <class _FormatContext, class _Func>
_NODISCARD constexpr auto _Format(
_FormatContext& _Format_ctx, const int _Width, _Fmt_align _Default_align, _Func&& _Fn) const {
return _STD _Fill_align_and_width_formatter_format(
_Format_ctx, _Specs, _Width, _Default_align, _STD forward<_Func>(_Fn));
}

private:
_Fill_align_and_width_specs<_CharT> _Specs;
};
#endif // _HAS_CXX23
_STD_END

Expand Down
Loading