[expected] Miscellaneous fixes

This fixes issues introduced with P0323R12 std::expected.

Author: jensmaurer

source/utilities.tex

@@ -6470,7 +6470,7 @@
 \rSec2[expected.general]{In general}
 
 \pnum
-This subclause describes the class template \tcode{expected}
+Subclause \ref{expected} describes the class template \tcode{expected}
 that represents expected objects.
 An \tcode{expected<T, E>} object holds
 an object of type \tcode{T} or an object of type \tcode{unexpected<E>} and
@@ -6510,7 +6510,7 @@
 \rSec3[expected.un.general]{General}
 
 \pnum
-This subclause describes the class template \tcode{unexpected}
+Subclause \ref{expected.unexpected} describes the class template \tcode{unexpected}
 that represents unexpected objects stored in \tcode{expected} objects.
 
 \rSec3[expected.un.object]{Class template \tcode{unexpected}}
@@ -6874,7 +6874,7 @@
 
     // \ref{expected.object.swap}, swap
     constexpr void swap(expected&) noexcept(@\seebelow@);
-    friend constexpr void swap(expected&, expected&) noexcept(@\seebelow@);
+    friend constexpr void swap(expected& x, expected& y) noexcept(noexcept(x.swap(y)));
 
     // \ref{expected.object.obs}, observers
     constexpr const T* operator->() const noexcept;
@@ -6897,7 +6897,7 @@
     template<class U> constexpr T value_or(U&&) &&;
 
     // \ref{expected.object.eq}, equality operators
-    template<class T2, class E2>
+    template<class T2, class E2> requires (!is_void_v<T2>)
       friend constexpr bool operator==(const expected& x, const expected<T2, E2>& y);
     template<class T2>
       friend constexpr bool operator==(const expected&, const T2&);
@@ -7044,7 +7044,7 @@
 
 \pnum
 \remarks
-The exception specification is
+The exception specification is equivalent to
 \tcode{is_nothrow_move_constructible_v<T> \&\&
 is_nothrow_move_constructible_v<E>}.
 
@@ -7383,7 +7383,7 @@
 \item
 \tcode{is_copy_constructible_v<E>} is \tcode{true} and
 \item
-\tcode{is_nothrow_move_constructible_v<E> || is_nothrow_move_constructible_v<T>}
+\tcode{is_nothrow_move_constructible_v<T> || is_nothrow_move_constructible_v<E>}
 is \tcode{true}.
 \end{itemize}
 \end{itemdescr}
@@ -7434,7 +7434,7 @@
 
 \pnum
 \remarks
-The exception specification is
+The exception specification is equivalent to:
 \begin{codeblock}
 is_nothrow_move_assignable_v<T> && is_nothrow_move_constructible_v<T> &&
 is_nothrow_move_assignable_v<E> && is_nothrow_move_constructible_v<E>
@@ -7609,7 +7609,7 @@
 \begin{floattable}{\tcode{swap(expected\&)} effects}{expected.object.swap}
 {lx{0.35\hsize}x{0.35\hsize}}
 \topline
-& \chdr{\tcode{this->has_value()}} & \rhdr{\tcode{!has_value()}} \\ \capsep
+& \chdr{\tcode{this->has_value()}} & \rhdr{\tcode{!this->has_value()}} \\ \capsep
 \lhdr{\tcode{rhs.has_value()}} &
   equivalent to: \tcode{using std::swap; swap(\exposid{val}, rhs.\exposid{val});} &
   calls \tcode{rhs.swap(*this)} \\
@@ -7654,7 +7654,7 @@
 
 \pnum
 \remarks
-The exception specification is:
+The exception specification is equivalent to:
 \begin{codeblock}
 is_nothrow_move_constructible_v<T> && is_nothrow_swappable_v<T> &&
 is_nothrow_move_constructible_v<E> && is_nothrow_swappable_v<E>
@@ -7809,7 +7809,7 @@
 \pnum
 \mandates
 \tcode{is_copy_constructible_v<T>} is \tcode{true} and
-\tcode{is_convertible<U, T>} is \tcode{true}.
+\tcode{is_convertible_v<U, T>} is \tcode{true}.
 
 \pnum
 \returns
@@ -7825,7 +7825,7 @@
 \pnum
 \mandates
 \tcode{is_move_constructible_v<T>} is \tcode{true} and
-\tcode{is_convertible<U, T>} is \tcode{true}.
+\tcode{is_convertible_v<U, T>} is \tcode{true}.
 
 \pnum
 \returns
@@ -7855,7 +7855,7 @@
 
 \indexlibrarymember{operator==}{expected}%
 \begin{itemdecl}
-template<class T2> constexpr bool operator==(const expected& x, const T2& v);
+template<class T2> friend constexpr bool operator==(const expected& x, const T2& v);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -7874,7 +7874,7 @@
 
 \indexlibrarymember{operator==}{expected}%
 \begin{itemdecl}
-template<class E2> constexpr bool operator==(const expected& x, const unexpected<E2>& e);
+template<class E2> friend constexpr bool operator==(const expected& x, const unexpected<E2>& e);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -7938,7 +7938,7 @@
 
   // \ref{expected.void.swap}, swap
   constexpr void swap(expected&) noexcept(@\seebelow@);
-  friend constexpr void swap(expected&, expected&) noexcept(@\seebelow@);
+  friend constexpr void swap(expected& x, expected& y) noexcept(noexcept(x.swap(y)));
 
   // \ref{expected.void.obs}, observers
   constexpr explicit operator bool() const noexcept;
@@ -8265,7 +8265,7 @@
 
 \pnum
 \remarks
-The exception specification is
+The exception specification is equivalent to
 \tcode{is_nothrow_move_constructible_v<E> \&\& is_nothrow_move_assignable_v<E>}.
 
 \pnum
@@ -8343,7 +8343,7 @@
 \begin{floattable}{\tcode{swap(expected\&)} effects}{expected.void.swap}
 {lx{0.35\hsize}x{0.35\hsize}}
 \topline
-& \chdr{\tcode{this->has_value()}} & \rhdr{\tcode{!has_value()}} \\ \capsep
+& \chdr{\tcode{this->has_value()}} & \rhdr{\tcode{!this->has_value()}} \\ \capsep
 \lhdr{\tcode{rhs.has_value()}} &
   no effects &
   calls \tcode{rhs.swap(*this)} \\
@@ -8367,7 +8367,7 @@
 
 \pnum
 \remarks
-The exception specification is
+The exception specification is equivalent to
 \tcode{is_nothrow_move_constructible_v<E> \&\& is_nothrow_swappable_v<E>}.
 \end{itemdescr}