[array] Dissolve single-item subclauses.

Partially addresses #1242.

Author: jensmaurer

Diff for: source/containers.tex

@@ -3238,27 +3238,7 @@
 \requires \tcode{(is_same_v<T, U> \&\& ...)} is \tcode{true}. Otherwise the program is ill-formed.
 \end{itemdescr}
 
-\rSec3[array.special]{\tcode{array} specialized algorithms}
-
-\indexlibrarymember{array}{swap}%
-\begin{itemdecl}
-template <class T, size_t N>
-  void swap(array<T, N>& x, array<T, N>& y) noexcept(noexcept(x.swap(y)));
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum\remarks
-This function shall not participate in overload resolution
-unless \tcode{N == 0} or \tcode{is_swappable_v<T>} is \tcode{true}.
-
-\pnum\effects
-As if by \tcode{x.swap(y)}.
-
-\pnum
-\complexity Linear in \tcode{N}.
-\end{itemdescr}
-
-\rSec3[array.size]{\tcode{array::size}}
+\rSec3[array.members]{\tcode{array} member functions}
 
 \indexlibrarymember{array}{size}%
 \begin{itemdecl}
@@ -3269,7 +3249,6 @@
 \pnum\returns \tcode{N}.
 \end{itemdescr}
 
-\rSec3[array.data]{\tcode{array::data}}
 \indexlibrarymember{array}{data}%
 \begin{itemdecl}
 constexpr T* data() noexcept;
@@ -3282,8 +3261,6 @@
 and \range{data()}{data() + size()} is a valid range.
 \end{itemdescr}
 
-\rSec3[array.fill]{\tcode{array::fill}}
-
 \indexlibrarymember{array}{fill}%
 \begin{itemdecl}
 void fill(const T& u);
@@ -3294,8 +3271,6 @@
 \effects As if by \tcode{fill_n(begin(), N, u)}.
 \end{itemdescr}
 
-\rSec3[array.swap]{\tcode{array::swap}}
-
 \indexlibrarymember{array}{swap}%
 \begin{itemdecl}
 void swap(array& y) noexcept(is_nothrow_swappable_v<T>);
@@ -3313,6 +3288,26 @@
 \end{note}
 \end{itemdescr}
 
+\rSec3[array.special]{\tcode{array} specialized algorithms}
+
+\indexlibrarymember{array}{swap}%
+\begin{itemdecl}
+template <class T, size_t N>
+  void swap(array<T, N>& x, array<T, N>& y) noexcept(noexcept(x.swap(y)));
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum\remarks
+This function shall not participate in overload resolution
+unless \tcode{N == 0} or \tcode{is_swappable_v<T>} is \tcode{true}.
+
+\pnum\effects
+As if by \tcode{x.swap(y)}.
+
+\pnum
+\complexity Linear in \tcode{N}.
+\end{itemdescr}
+
 \rSec3[array.zero]{Zero sized arrays}
 
 \indextext{\idxcode{array}!zero sized}%

Diff for: source/xrefdelta.tex

@@ -36,5 +36,11 @@
   \secref{fs.path.generic},
   \secref{fs.race.behavior}}
 
+% Single-item array subclauses were dissolved.
+\movedxref{array.size}{array.members}
+\movedxref{array.data}{array.members}
+\movedxref{array.fill}{array.members}
+\movedxref{array.swap}{array.members}
+
 % Deprecated features.
 %\deprxref{old.label}  (if moved to depr.old.label, otherwise use \movedxref)