Use Slice<T> for mutable slices

Author: 2xsaiko

gen/src/builtin.rs

@@ -8,7 +8,6 @@ pub struct Builtins<'a> {
     pub rust_string: bool,
     pub rust_str: bool,
     pub rust_slice: bool,
-    pub rust_mut_slice: bool,
     pub rust_box: bool,
     pub rust_vec: bool,
     pub rust_fn: bool,
@@ -23,8 +22,6 @@ pub struct Builtins<'a> {
     pub rust_str_repr: bool,
     pub rust_slice_new: bool,
     pub rust_slice_repr: bool,
-    pub rust_mut_slice_new: bool,
-    pub rust_mut_slice_repr: bool,
     pub exception: bool,
     pub relocatable: bool,
     pub friend_impl: bool,
@@ -62,10 +59,6 @@ pub(super) fn write(out: &mut OutFile) {
         builtin.friend_impl = true;
     }
 
-    if builtin.rust_mut_slice {
-        builtin.friend_impl = true;
-    }
-
     if builtin.rust_box {
         include.new = true;
         include.type_traits = true;
@@ -119,7 +112,6 @@ pub(super) fn write(out: &mut OutFile) {
     ifndef::write(out, builtin.rust_string, "CXXBRIDGE05_RUST_STRING");
     ifndef::write(out, builtin.rust_str, "CXXBRIDGE05_RUST_STR");
     ifndef::write(out, builtin.rust_slice, "CXXBRIDGE05_RUST_SLICE");
-    ifndef::write(out, builtin.rust_mut_slice, "CXXBRIDGE05_RUST_MUT_SLICE");
     ifndef::write(out, builtin.rust_box, "CXXBRIDGE05_RUST_BOX");
     ifndef::write(out, builtin.unsafe_bitcopy, "CXXBRIDGE05_RUST_BITCOPY");
     ifndef::write(out, builtin.rust_vec, "CXXBRIDGE05_RUST_VEC");
@@ -214,33 +206,6 @@ pub(super) fn write(out: &mut OutFile) {
         writeln!(out, "}};");
     }
 
-    if builtin.rust_mut_slice_new || builtin.rust_mut_slice_repr {
-        out.next_section();
-        writeln!(out, "template <typename T>");
-        writeln!(out, "class impl<MutSlice<T>> final {{");
-        writeln!(out, "public:");
-        if builtin.rust_mut_slice_new {
-            writeln!(
-                out,
-                "  static MutSlice<T> slice(repr::PtrLen repr) noexcept {{",
-            );
-            writeln!(
-                out,
-                "    return {{static_cast<T *>(repr.ptr), repr.len}};",
-            );
-            writeln!(out, "  }}");
-        }
-        if builtin.rust_mut_slice_repr {
-            writeln!(
-                out,
-                "  static repr::PtrLen repr(MutSlice<T> slice) noexcept {{",
-            );
-            writeln!(out, "    return repr::PtrLen{{slice.ptr, slice.len}};");
-            writeln!(out, "  }}");
-        }
-        writeln!(out, "}};");
-    }
-
     if builtin.rust_error {
         out.next_section();
         writeln!(out, "template <>");

include/cxx.h

@@ -116,30 +116,6 @@ class Slice final {
 };
 #endif // CXXBRIDGE05_RUST_SLICE
 
-#ifndef CXXBRIDGE05_RUST_MUT_SLICE
-template <typename T>
-class MutSlice final {
-public:
-  MutSlice() noexcept;
-  MutSlice(T *, size_t count) noexcept;
-
-  MutSlice &operator=(const MutSlice<T> &) noexcept = default;
-
-  T *data() const noexcept;
-  size_t size() const noexcept;
-  size_t length() const noexcept;
-
-  ~MutSlice() noexcept = default;
-
-private:
-  friend impl<MutSlice>;
-  // Not necessarily ABI compatible with &mut [T]. Codegen will translate to
-  // cxx::rust_mutsliceu8::RustMutSliceU8 which matches this layout.
-  T *ptr;
-  size_t len;
-};
-#endif // CXXBRIDGE05_RUST_MUT_SLICE
-
 #ifndef CXXBRIDGE05_RUST_BOX
 template <typename T>
 class Box final {
@@ -406,30 +382,6 @@ size_t Slice<T>::length() const noexcept {
 }
 #endif // CXXBRIDGE05_RUST_SLICE
 
-#ifndef CXXBRIDGE05_RUST_MUT_SLICE
-#define CXXBRIDGE05_RUST_MUT_SLICE
-template <typename T>
-MutSlice<T>::MutSlice() noexcept : ptr(reinterpret_cast<T *>(this)), len(0) {}
-
-template <typename T>
-MutSlice<T>::MutSlice(T *s, size_t count) noexcept : ptr(s), len(count) {}
-
-template <typename T>
-T *MutSlice<T>::data() const noexcept {
-  return this->ptr;
-}
-
-template <typename T>
-size_t MutSlice<T>::size() const noexcept {
-  return this->len;
-}
-
-template <typename T>
-size_t MutSlice<T>::length() const noexcept {
-  return this->len;
-}
-#endif // CXXBRIDGE05_RUST_MUT_SLICE
-
 #ifndef CXXBRIDGE05_RUST_BOX
 #define CXXBRIDGE05_RUST_BOX
 template <typename T>