Rename slice nonnull ptr accessor to match std NonNull<[T]>::as_non_null_ptr
https://doc.rust-lang.org/1.54.0/std/ptr/struct.NonNull.html#method.as_non_null_ptr
diff --git a/src/rust_slice.rs b/src/rust_slice.rs
index 65fa87d..aad78a4 100644
--- a/src/rust_slice.rs
+++ b/src/rust_slice.rs
@@ -24,15 +24,15 @@
}
pub unsafe fn as_slice<'a, T>(self) -> &'a [T] {
- let ptr = self.as_ptr();
+ let ptr = self.as_non_null_ptr().as_ptr();
let len = self.len();
- slice::from_raw_parts(ptr.as_ptr(), len)
+ slice::from_raw_parts(ptr, len)
}
pub unsafe fn as_mut_slice<'a, T>(self) -> &'a mut [T] {
- let ptr = self.as_ptr();
+ let ptr = self.as_non_null_ptr().as_ptr();
let len = self.len();
- slice::from_raw_parts_mut(ptr.as_ptr(), len)
+ slice::from_raw_parts_mut(ptr, len)
}
pub(crate) fn from_raw_parts<T>(ptr: NonNull<T>, len: usize) -> Self {
@@ -43,7 +43,7 @@
unsafe { mem::transmute::<NonNull<[()]>, RustSlice>(NonNull::new_unchecked(ptr)) }
}
- pub(crate) fn as_ptr<T>(&self) -> NonNull<T> {
+ pub(crate) fn as_non_null_ptr<T>(&self) -> NonNull<T> {
let rust_slice = RustSlice { repr: self.repr };
let repr = unsafe { mem::transmute::<RustSlice, NonNull<[()]>>(rust_slice) };
repr.cast()
diff --git a/src/symbols/rust_slice.rs b/src/symbols/rust_slice.rs
index b6cbce6..901a804 100644
--- a/src/symbols/rust_slice.rs
+++ b/src/symbols/rust_slice.rs
@@ -10,7 +10,7 @@
#[export_name = "cxxbridge1$slice$ptr"]
unsafe extern "C" fn slice_ptr(this: &RustSlice) -> NonNull<()> {
- this.as_ptr()
+ this.as_non_null_ptr()
}
#[export_name = "cxxbridge1$slice$len"]