Skip to content

Commit b4f5ef4

Browse files
committed
FIXUP P2286R8: Use improve formatting, fix typos, add \libconcepts, heed other suggestions from review
1 parent 3951eca commit b4f5ef4

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

source/containers.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9304,20 +9304,20 @@
93049304
\begin{codeblock}
93059305
namespace std {
93069306
template<class T, class charT>
9307-
requires @\exposid{is-vector-bool-reference}@<T>
9308-
struct formatter<T, charT> {
9309-
private:
9310-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
9307+
requires @\exposid{is-vector-bool-reference}@<T>
9308+
struct formatter<T, charT> {
9309+
private:
9310+
formatter<bool, charT> @\exposid{underlying_}@; // \expos
93119311

9312-
public:
9313-
template<class ParseContext>
9314-
constexpr typename ParseContext::iterator
9315-
parse(ParseContext& ctx);
9312+
public:
9313+
template<class ParseContext>
9314+
constexpr typename ParseContext::iterator
9315+
parse(ParseContext& ctx);
93169316

9317-
template<class FormatContext>
9318-
typename FormatContext::iterator
9319-
format(const T& ref, FormatContext& ctx) const;
9320-
};
9317+
template<class FormatContext>
9318+
typename FormatContext::iterator
9319+
format(const T& ref, FormatContext& ctx) const;
9320+
};
93219321
}
93229322
\end{codeblock}
93239323

@@ -14507,7 +14507,7 @@
1450714507
As if by \tcode{x.swap(y)}.
1450814508
\end{itemdescr}
1450914509

14510-
\rSec2[container.adaptors.format]{Container adapters formatting}
14510+
\rSec2[container.adaptors.format]{Container adaptors formatting}
1451114511

1451214512
\pnum
1451314513
For each of

source/utilities.tex

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13483,7 +13483,7 @@
1348313483
requires @\libconcept{same_as}@<remove_cvref_t<T>, T> && @\libconcept{formattable}@<T, charT>
1348413484
class range_formatter;
1348513485

13486-
template<ranges::input_range R, class charT>
13486+
template<ranges::@\libconcept{input_range}@ R, class charT>
1348713487
requires (!@\libconcept{same_as}@<remove_cvref_t<ranges::range_reference_t<R>>, R>) &&
1348813488
@\libconcept{formattable}@<ranges::range_reference_t<R>, charT>
1348913489
struct formatter<R, charT>;
@@ -15264,7 +15264,7 @@
1526415264
\end{codeblock}
1526515265
\end{example}
1526615266

15267-
\rSec2[format.range.formatter]{Range formatter}
15267+
\rSec2[format.range.formatter]{Class template \tcode{range_formatter}}
1526815268

1526915269
\pnum
1527015270
The class template \tcode{range_formatter} is a utility
@@ -15318,7 +15318,7 @@
1531815318
The \tcode{n} option causes the range to be formatted
1531915319
without the opening and closing brackets.
1532015320
\begin{note}
15321-
This is equivalent to invoking \tcode{set_brackets(\{\}, \{\}}).
15321+
This is equivalent to invoking \tcode{set_brackets(\{\}, \{\})}.
1532215322
\end{note}
1532315323

1532415324
\pnum
@@ -15386,9 +15386,9 @@
1538615386
constexpr typename ParseContext::iterator
1538715387
parse(ParseContext& ctx);
1538815388

15389-
template<ranges::input_range R, class FormatContext>
15389+
template<ranges::@\libconcept{input_range}@ R, class FormatContext>
1539015390
requires @\libconcept{formattable}@<ranges::range_reference_t<R>, charT> &&
15391-
@\libconcept{same_as}@<remove_cvref_t<ranges::range_reference_t<R>>, T>
15391+
@\libconcept{same_as}@<remove_cvref_t<ranges::range_reference_t<R>>, T>
1539215392
typename FormatContext::iterator
1539315393
format(R&& r, FormatContext& ctx) const;
1539415394
};
@@ -15455,7 +15455,7 @@
1545515455

1545615456
\indexlibrarymember{format}{range_formatter}%
1545715457
\begin{itemdecl}
15458-
template<ranges::input_range R, class FormatContext>
15458+
template<ranges::@\libconcept{input_range}@ R, class FormatContext>
1545915459
requires @\libconcept{formattable}@<ranges::range_reference_t<R>, charT> &&
1546015460
@\libconcept{same_as}@<remove_cvref_t<ranges::range_reference_t<R>>, T>
1546115461
typename FormatContext::iterator
@@ -15502,7 +15502,7 @@
1550215502
\indexlibraryglobal{formatter}%
1550315503
\begin{codeblock}
1550415504
namespace std {
15505-
template<ranges::input_range R, class charT>
15505+
template<ranges::@\libconcept{input_range}@ R, class charT>
1550615506
requires (!@\libconcept{same_as}@<remove_cvref_t<ranges::range_reference_t<R>>, R>) &&
1550715507
@\libconcept{formattable}@<ranges::range_reference_t<R>, charT>
1550815508
struct formatter<R, charT> {
@@ -16012,7 +16012,7 @@
1601216012
\indexlibraryglobal{formatter}%
1601316013
\begin{codeblock}
1601416014
namespace std {
16015-
template<class charT, @\libconcept{formattable}@<charT>... Ts>
16015+
template<class charT, @\libconcept{formattable}@<charT>... Ts>
1601616016
struct formatter<@\placeholder{pair-or-tuple}@<Ts...>, charT> {
1601716017
private:
1601816018
tuple<formatter<remove_cvref_t<Ts>, charT>...> @\exposid{underlying_}@; // \expos
@@ -16023,7 +16023,7 @@
1602316023
public:
1602416024
constexpr void set_separator(basic_string_view<charT> sep);
1602516025
constexpr void set_brackets(basic_string_view<charT> opening,
16026-
basic_string_view<charT> closing);
16026+
basic_string_view<charT> closing);
1602716027

1602816028
template<class ParseContext>
1602916029
constexpr typename ParseContext::iterator
@@ -16187,6 +16187,7 @@
1618716187
the result of writing \tcode{get<I>(elems)}
1618816188
via \tcode{get<I>(\exposid{underlying_})}, and
1618916189
\end{itemize}
16190+
\item
1619016191
\exposid{closing-bracket_}.
1619116192
\end{itemize}
1619216193

0 commit comments

Comments
 (0)