@@ -17,42 +17,54 @@ namespace
1717
1818struct CopyableNotMovable
1919{
20- CopyableNotMovable () = default ;
21- CopyableNotMovable (const CopyableNotMovable &) = default ;
20+ CopyableNotMovable () = default ;
21+ CopyableNotMovable (const CopyableNotMovable &) = default ;
2222 CopyableNotMovable &operator =(const CopyableNotMovable &) = default ;
23- CopyableNotMovable (CopyableNotMovable &&) = delete ;
24- CopyableNotMovable &operator =(CopyableNotMovable &&) = delete ;
23+ CopyableNotMovable (CopyableNotMovable &&) = delete ;
24+ CopyableNotMovable &operator =(CopyableNotMovable &&) = delete ;
2525};
2626
2727struct NotCopyableNotMovable
2828{
29- NotCopyableNotMovable () = default ;
30- NotCopyableNotMovable (const NotCopyableNotMovable &) = delete ;
29+ NotCopyableNotMovable () = default ;
30+ NotCopyableNotMovable (const NotCopyableNotMovable &) = delete ;
3131 NotCopyableNotMovable &operator =(const NotCopyableNotMovable &) = delete ;
32- NotCopyableNotMovable (NotCopyableNotMovable &&) = delete ;
33- NotCopyableNotMovable &operator =(NotCopyableNotMovable &&) = delete ;
32+ NotCopyableNotMovable (NotCopyableNotMovable &&) = delete ;
33+ NotCopyableNotMovable &operator =(NotCopyableNotMovable &&) = delete ;
3434};
3535
3636struct MoveOnly
3737{
3838 int value;
39- MoveOnly () : value(0 ) {}
40- MoveOnly (int v) : value(v) {}
41- MoveOnly (const MoveOnly &) = delete ;
39+ MoveOnly ()
40+ : value(0 )
41+ {
42+ }
43+ MoveOnly (int v)
44+ : value(v)
45+ {
46+ }
47+ MoveOnly (const MoveOnly &) = delete ;
4248 MoveOnly &operator =(const MoveOnly &) = delete ;
43- MoveOnly (MoveOnly &&) = default ;
44- MoveOnly &operator =(MoveOnly &&) = default ;
49+ MoveOnly (MoveOnly &&) = default ;
50+ MoveOnly &operator =(MoveOnly &&) = default ;
4551};
4652
4753struct StatefulCopyableNotMovable
4854{
4955 int value;
50- StatefulCopyableNotMovable () : value(0 ) {}
51- StatefulCopyableNotMovable (int v) : value(v) {}
52- StatefulCopyableNotMovable (const StatefulCopyableNotMovable &) = default ;
56+ StatefulCopyableNotMovable ()
57+ : value(0 )
58+ {
59+ }
60+ StatefulCopyableNotMovable (int v)
61+ : value(v)
62+ {
63+ }
64+ StatefulCopyableNotMovable (const StatefulCopyableNotMovable &) = default ;
5365 StatefulCopyableNotMovable &operator =(const StatefulCopyableNotMovable &) = default ;
54- StatefulCopyableNotMovable (StatefulCopyableNotMovable &&) = delete ;
55- StatefulCopyableNotMovable &operator =(StatefulCopyableNotMovable &&) = delete ;
66+ StatefulCopyableNotMovable (StatefulCopyableNotMovable &&) = delete ;
67+ StatefulCopyableNotMovable &operator =(StatefulCopyableNotMovable &&) = delete ;
5668};
5769
5870} // namespace
@@ -68,8 +80,7 @@ TEST_CASE("expected<void, E> is trivially move-assignable when E is trivial", "[
6880 STATIC_REQUIRE (std::is_nothrow_move_assignable_v<expected<void , int >>);
6981}
7082
71- TEST_CASE (" expected<void, E> is move-assignable via copy fallback when E is copyable but not movable" ,
72- " [LWG-4025]" )
83+ TEST_CASE (" expected<void, E> is move-assignable via copy fallback when E is copyable but not movable" , " [LWG-4025]" )
7384{
7485 STATIC_REQUIRE (std::is_move_assignable_v<expected<void , CopyableNotMovable>>);
7586 STATIC_REQUIRE (std::is_trivially_move_assignable_v<expected<void , CopyableNotMovable>>);
@@ -172,8 +183,7 @@ TEST_CASE("expected<T, E> is trivially move-assignable when E is trivial", "[LWG
172183 STATIC_REQUIRE (std::is_nothrow_move_assignable_v<expected<int , int >>);
173184}
174185
175- TEST_CASE (" expected<T, E> is move-assignable via copy fallback when E is copyable but not movable" ,
176- " [LWG-4025]" )
186+ TEST_CASE (" expected<T, E> is move-assignable via copy fallback when E is copyable but not movable" , " [LWG-4025]" )
177187{
178188 STATIC_REQUIRE (std::is_move_assignable_v<expected<int , CopyableNotMovable>>);
179189 STATIC_REQUIRE (std::is_trivially_move_assignable_v<expected<int , CopyableNotMovable>>);
0 commit comments