[libcxx-commits] [libcxx] 5f5416e - [libc++] NFC: Fix a few tests in tuple that would succeed trivially

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-02-24T11:33:41-05:00
New Revision: 5f5416e1c4b418d59f7f944060c8a39ced2189a0

URL: https://github.com/llvm/llvm-project/commit/5f5416e1c4b418d59f7f944060c8a39ced2189a0
DIFF: https://github.com/llvm/llvm-project/commit/5f5416e1c4b418d59f7f944060c8a39ced2189a0.diff

LOG: [libc++] NFC: Fix a few tests in tuple that would succeed trivially

Added: 
    

Modified: 
    libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
    libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
    libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
    libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
index e865244f2b7a..02c59948d7f8 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
         // is properly deleted
         using T = std::tuple<int, int>;
         using P = std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>;
-        static_assert(!std::is_assignable<T, const P &>::value, "");
+        static_assert(!std::is_assignable<T&, const P &>::value, "");
     }
     {
         typedef std::tuple<NothrowCopyAssignable, long> Tuple;

diff  --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
index 1c78e59f0faa..b50cbdef8abf 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
@@ -103,10 +103,10 @@ int main(int, char**)
         assert(&std::get<0>(t) == &x);
     }
     {
-      using T = std::tuple<int, NonAssignable>;
-      using U = std::tuple<NonAssignable, int>;
-      static_assert(!std::is_assignable<T, U const&>::value, "");
-      static_assert(!std::is_assignable<U, T const&>::value, "");
+        using T = std::tuple<int, NonAssignable>;
+        using U = std::tuple<NonAssignable, int>;
+        static_assert(!std::is_assignable<T&, U const&>::value, "");
+        static_assert(!std::is_assignable<U&, T const&>::value, "");
     }
     {
         typedef std::tuple<NothrowCopyAssignable, long> T0;

diff  --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
index 9465d9928d2a..04bec1a67feb 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
@@ -124,10 +124,10 @@ int main(int, char**)
         assert(&std::get<0>(t) == &x);
     }
     {
-      using T = std::tuple<int, NonAssignable>;
-      using U = std::tuple<NonAssignable, int>;
-      static_assert(!std::is_assignable<T, U&&>::value, "");
-      static_assert(!std::is_assignable<U, T&&>::value, "");
+        using T = std::tuple<int, NonAssignable>;
+        using U = std::tuple<NonAssignable, int>;
+        static_assert(!std::is_assignable<T&, U&&>::value, "");
+        static_assert(!std::is_assignable<U&, T&&>::value, "");
     }
     {
         typedef std::tuple<NothrowMoveAssignable, long> T0;

diff  --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
index 71882a4587b2..a0356464adfc 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
@@ -111,19 +111,20 @@ int main(int, char**)
         static_assert(!std::is_copy_assignable<T>::value, "");
     }
     {
-      using T = std::tuple<int, int, int>;
-      using P = std::pair<int, int>;
-      static_assert(!std::is_assignable<T, P>::value, "");
+        using T = std::tuple<int, int, int>;
+        using P = std::pair<int, int>;
+        static_assert(!std::is_assignable<T&, P>::value, "");
     }
-    { // test const requirement
-      using T = std::tuple<CopyAssignableInt, CopyAssignableInt>;
-      using P = std::pair<int, int>;
-      static_assert(!std::is_assignable<T&, P const>::value, "");
+    {
+        // test const requirement
+        using T = std::tuple<CopyAssignableInt, CopyAssignableInt>;
+        using P = std::pair<int, int>;
+        static_assert(!std::is_assignable<T&, P const>::value, "");
     }
     {
-      using T = std::tuple<int, MoveAssignable>;
-      using P = std::pair<int, MoveAssignable>;
-      static_assert(!std::is_assignable<T&, P&>::value, "");
+        using T = std::tuple<int, MoveAssignable>;
+        using P = std::pair<int, MoveAssignable>;
+        static_assert(!std::is_assignable<T&, P&>::value, "");
     }
     {
         using T = std::tuple<NothrowCopyAssignable, int>;