expect assign, formatting and fix shadow

Author: smallp-o-p

libcxx/test/std/utilities/expected/expected.expected/assign/assign.U.pass.cpp

@@ -325,6 +325,41 @@ constexpr bool test() {
     }
   }
 
+  // Check move constructor selection
+  {
+    struct MoveOnlyMulti {
+      bool used_move1 = false;
+      bool used_move2 = false;
+
+      constexpr MoveOnlyMulti()                                = default;
+      constexpr MoveOnlyMulti(const MoveOnlyMulti&)            = delete;
+      constexpr MoveOnlyMulti& operator=(const MoveOnlyMulti&) = delete;
+      constexpr MoveOnlyMulti& operator=(MoveOnlyMulti&&) {
+        used_move1 = true;
+        return *this;
+      }
+      constexpr MoveOnlyMulti& operator=(const MoveOnlyMulti&&) {
+        used_move2 = true;
+        return *this;
+      };
+      constexpr MoveOnlyMulti(MoveOnlyMulti&&) : used_move1(true) {}
+      constexpr MoveOnlyMulti(const MoveOnlyMulti&&) : used_move2(true) {}
+    };
+
+    {
+      MoveOnlyMulti t{};
+      std::expected<MoveOnlyMulti, int> e1(std::unexpect);
+      e1 = std::move(t);
+      assert(e1.value().used_move1);
+    }
+    {
+      const MoveOnlyMulti t{};
+      std::expected<MoveOnlyMulti, int> e1(std::unexpect);
+      e1 = std::move(t);
+      assert(e1.value().used_move2);
+    }
+  }
+
   return true;
 }
 

libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.u.pass.cpp

@@ -85,7 +85,7 @@ struct MoveOnly2 {
   bool used_move1 = false;
   bool used_move2 = false;
 
-  constexpr explicit MoveOnly2(int j) : j(j) {}
+  constexpr explicit MoveOnly2(int jj) : j(jj) {}
   constexpr MoveOnly2(const MoveOnly2&) = delete;
   constexpr MoveOnly2(MoveOnly2&& m) : j(m.j), used_move1(true) {}
   constexpr MoveOnly2(const MoveOnly2&& m) : j(m.j), used_move2(true) {}

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp

@@ -134,12 +134,12 @@ void test_explicit() {
         }
         T::reset();
         {
-            optional<T> t{43};
-            assert(T::alive == 1);
-            assert(T::value_constructed == 1);
-            assert(T::move_constructed == 0);
-            assert(T::copy_constructed == 0);
-            assert(t.value().value == 43);
+          optional<T> t{43};
+          assert(T::alive == 1);
+          assert(T::value_constructed == 1);
+          assert(T::move_constructed == 0);
+          assert(T::copy_constructed == 0);
+          assert(t.value().value == 43);
         }
         assert(T::alive == 0);
     }