[over.match.class.deduct] Put all bullets describing the properties of

f' at the same depth, and guard them all by the condition that we're
actually adding an f' to the set of guides.

Author: zygoloid

source/overloading.tex

@@ -1583,50 +1583,52 @@
 For each function or function template \tcode{f} in the guides of
 the template named by the \grammarterm{simple-template-id}
 of the \grammarterm{defining-type-id},
+the template arguments of the return type of \tcode{f}
+are deduced
+from the \grammarterm{defining-type-id} of \tcode{A}
+according to the process in \ref{temp.deduct.type}
+with the exception that deduction does not fail
+if not all template arguments are deduced.
+Let \tcode{g} denote the result of substituting
+these deductions into \tcode{f}.
+If substitution succeeds,
 form a function or function template \tcode{f'}
-according to the following procedure and add it to the set:
+with the following properties and add it to the set
+of guides of \tcode{A}:
 \begin{itemize}
 \item
-  The template arguments of the return type of \tcode{f}
-  are deduced
-  from the \grammarterm{defining-type-id} of \tcode{A}
-  according to the process in \ref{temp.deduct.type}
-  with the exception that deduction does not fail
-  if not all template arguments are deduced.
-  Let \tcode{g} denote the result of substituting
-  these deductions into \tcode{f}.
-  If the substitution fails, no \tcode{f'} is produced.
-  Otherwise, the function or function template \tcode{f'} is formed as follows:
-  \begin{itemize}
-  \item
-    The function type of \tcode{f'} is the function type of \tcode{g}.
-  \item
-    If \tcode{f} is a function template,
-    \tcode{f'} is a function template whose
-    template parameter list consists of
-    all the template parameters of \tcode{A}
-    (including their default template arguments)
-    that appear in the above deductions or
-    (recursively) in their default template arguments,
-    followed by the template parameters of \tcode{f} that were not deduced
-    (including their default template arguments),
-    otherwise \tcode{f'} is not a function template.
-  \item
-    The associated constraints\iref{temp.constr.decl} are
-    the conjunction of the associated constraints of \tcode{g} and
-    a constraint that is satisfied if and only if
-    the arguments of \tcode{A} are deducible (see below) from the return type.
-  \end{itemize}
+The function type of \tcode{f'} is the function type of \tcode{g}.
+
+\item
+If \tcode{f} is a function template,
+\tcode{f'} is a function template whose
+template parameter list consists of
+all the template parameters of \tcode{A}
+(including their default template arguments)
+that appear in the above deductions or
+(recursively) in their default template arguments,
+followed by the template parameters of \tcode{f} that were not deduced
+(including their default template arguments),
+otherwise \tcode{f'} is not a function template.
+
 \item
-  If \tcode{f} is a copy deduction candidate\iref{over.match.class.deduct},
-  then \tcode{f'} is considered to be so as well.
+The associated constraints\iref{temp.constr.decl} are
+the conjunction of the associated constraints of \tcode{g} and
+a constraint that is satisfied if and only if
+the arguments of \tcode{A} are deducible (see below) from the return type.
+
 \item
-  If \tcode{f} was generated
-  from a deduction-guide\iref{over.match.class.deduct},
-  then \tcode{f'} is considered to be so as well.
+If \tcode{f} is a copy deduction candidate\iref{over.match.class.deduct},
+then \tcode{f'} is considered to be so as well.
+
+\item
+If \tcode{f} was generated
+from a \grammarterm{deduction-guide}\iref{over.match.class.deduct},
+then \tcode{f'} is considered to be so as well.
+
 \item
-  The \grammarterm{explicit-specifier} of \tcode{f'} is
-  the \grammarterm{explicit-specifier} of g (if any).
+The \grammarterm{explicit-specifier} of \tcode{f'} is
+the \grammarterm{explicit-specifier} of \tcode{g} (if any).
 \end{itemize}
 
 \indextext{template!deducible arguments of}%