Merge pull request #646 from dtolnay/swap

Restore swapping Str and Slice in member function form only

Author: dtolnay

book/src/binding/slice.md

@@ -40,6 +40,8 @@ public:
   class iterator;
   iterator begin() const noexcept;
   iterator end() const noexcept;
+
+  void swap(Slice &) noexcept;
 };
 #
 # template <typename T>

book/src/binding/str.md

@@ -44,6 +44,8 @@ public:
   bool operator<=(const Str &) const noexcept;
   bool operator>(const Str &) const noexcept;
   bool operator>=(const Str &) const noexcept;
+
+  void swap(Str &) noexcept;
 };
 
 std::ostream &operator<<(std::ostream &, const Str &);

include/cxx.h

@@ -125,6 +125,8 @@ class Str final {
   bool operator>(const Str &) const noexcept;
   bool operator>=(const Str &) const noexcept;
 
+  void swap(Str &) noexcept;
+
 private:
   std::array<std::uintptr_t, 2> repr;
 };
@@ -175,6 +177,8 @@ class Slice final
   iterator begin() const noexcept;
   iterator end() const noexcept;
 
+  void swap(Slice &) noexcept;
+
 private:
   // Not necessarily ABI compatible with &[T]. Codegen will translate to
   // cxx::rust_slice::RustSlice which matches this layout.
@@ -666,6 +670,11 @@ typename Slice<T>::iterator Slice<T>::end() const noexcept {
   it.pos = static_cast<char *>(it.pos) + it.stride * this->len;
   return it;
 }
+
+template <typename T>
+void Slice<T>::swap(Slice &rhs) noexcept {
+  std::swap(*this, rhs);
+}
 #endif // CXXBRIDGE1_RUST_SLICE
 
 #ifndef CXXBRIDGE1_RUST_BOX

src/cxx.cc

@@ -267,6 +267,8 @@ bool Str::operator>(const Str &rhs) const noexcept { return rhs < *this; }
 
 bool Str::operator>=(const Str &rhs) const noexcept { return rhs <= *this; }
 
+void Str::swap(Str &rhs) noexcept { std::swap(*this, rhs); }
+
 std::ostream &operator<<(std::ostream &os, const Str &s) {
   os.write(s.data(), s.size());
   return os;