[libc++][test] Clean up libcxx/test/support/MoveOnly.h

[jloser]

Summary

Remove copy and copy assignment rather than have them as private declarations.
They are superfluous given the move and move assignment.

As a drive-by, also specialize std::hash without reopening namespace std.

[jloser]

Fix type in git one-liner

[• Quuxplusone]

libcxx/test/support/MoveOnly.h

29–31

Just eliminate these; they're superfluous given lines 24–27.

But also, please re-upload the diff tagging it "libc++", because it doesn't look like the buildkite CI actually ran. It's just saying "Build 216170: arc lint + arc unit". https://reviews.llvm.org/harbormaster/build/216170/

[jloser]

Remove copy and copy assignment rather than = delete them
s/libcxx/libc++ in the one liner so CI runs

[jloser]

Adjust expected-error message in libcxx/test/std/containers/sequences/array/array.creation/to_array.fail.cpp which should fix CI

[jloser]

Fix the expected-error message in to_array.fail.pass tests now that the MoveOnly copy constructor is actually implicitly deleted

[• Quuxplusone]

The Apple build CI failure is unrelated. Ship it!

libcxx/test/std/containers/sequences/array/array.creation/to_array.fail.cpp

int main(int, char**) {
     // expected-error@array:* {{to_array requires copy constructible elements}}
     // expected-error@array:* 3 {{cannot initialize}}
     std::to_array(source); // expected-note {{requested here}}
   }
 
   {
     MoveOnly mo[] = {MoveOnly{3}};
     // expected-error@array:* {{to_array requires copy constructible elements}}
-    // expected-error@array:* {{calling a private constructor}}
+    // expected-error@array:* {{call to implicitly-deleted copy constructor of 'MoveOnly'}}
     std::to_array(mo); // expected-note {{requested here}}
   }
 
   {
     const MoveOnly cmo[] = {MoveOnly{3}};
     // expected-error@array:* {{to_array requires move constructible elements}}
-    // expected-error@array:* {{calling a private constructor}}
+    // expected-error@array:* {{call to implicitly-deleted copy constructor of 'MoveOnly'}}
     std::to_array(std::move(cmo)); // expected-note {{requested here}}
   }
 
   return 0;
 }

libcxx/test/support/MoveOnly.h

 
 #if TEST_STD_VER >= 11
 
 #include <cstddef>
 #include <functional>
 
 class MoveOnly
 {
-    MoveOnly(const MoveOnly&);
-    MoveOnly& operator=(const MoveOnly&);
-
     int data_;
 public:
     constexpr MoveOnly(int data = 1) : data_(data) {}
     TEST_CONSTEXPR_CXX14 MoveOnly(MoveOnly&& x)
         : data_(x.data_) {x.data_ = 0;}
     TEST_CONSTEXPR_CXX14 MoveOnly& operator=(MoveOnly&& x)
         {data_ = x.data_; x.data_ = 0; return *this;}
 
     constexpr int get() const {return data_;}
 
     friend constexpr bool operator==(const MoveOnly& x, const MoveOnly& y)
         { return x.data_ == y.data_; }
     friend constexpr bool operator!=(const MoveOnly& x, const MoveOnly& y)
         { return x.data_ != y.data_; }
     friend constexpr bool operator< (const MoveOnly& x, const MoveOnly& y)
         { return x.data_ <  y.data_; }
     friend constexpr bool operator<=(const MoveOnly& x, const MoveOnly& y)
         { return x.data_ <= y.data_; }
     friend constexpr bool operator> (const MoveOnly& x, const MoveOnly& y)
         { return x.data_ >  y.data_; }
     friend constexpr bool operator>=(const MoveOnly& x, const MoveOnly& y)
         { return x.data_ >= y.data_; }
 
     TEST_CONSTEXPR_CXX14 MoveOnly operator+(const MoveOnly& x) const
         { return MoveOnly{data_ + x.data_}; }
     TEST_CONSTEXPR_CXX14 MoveOnly operator*(const MoveOnly& x) const
         { return MoveOnly{data_ * x.data_}; }
 
     template<class T, class U>
     friend void operator,(T t, U u) = delete;
 };
 
-namespace std {
 
 template <>
-struct hash<MoveOnly>
+struct std::hash<MoveOnly>
 {
     typedef MoveOnly argument_type;
     typedef size_t result_type;
     constexpr size_t operator()(const MoveOnly& x) const {return x.get();}
 };
 
-}
-
 #endif // TEST_STD_VER >= 11
 
 #endif // MOVEONLY_H