topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-25 02:20:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add CxxVector::as_slice -> &[T]

Browse Source
This commit is contained in:
David Tolnay 2020-09-24 15:58:20 -04:00
parent 950fb211a8
commit 93637cac19
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macro/src/expand.rs
View File

@ -859,12 +859,12 @@ fn expand_cxx_vector(namespace: &Namespace, elem: &Ident) -> TokenStream {
}
unsafe { __vector_size(v) }
}
unsafe fn __get_unchecked(v: &::cxx::CxxVector<Self>, pos: usize) -> &Self {
unsafe fn __get_unchecked(v: &::cxx::CxxVector<Self>, pos: usize) -> *const Self {
extern "C" {
#[link_name = #link_get_unchecked]
fn __get_unchecked(_: &::cxx::CxxVector<#elem>, _: usize) -> *const #elem;
}
&*__get_unchecked(v, pos)
__get_unchecked(v, pos)
}
fn __unique_ptr_null() -> *mut ::std::ffi::c_void {
extern "C" {

22
src/cxx_vector.rs
View File

@ -4,6 +4,7 @@ use core::fmt::{self, Display};
use core::marker::PhantomData;
use core::mem;
use core::ptr;
use core::slice;
/// Binding to C++ `std::vector<T, std::allocator<T>>`.
///
@ -44,7 +45,7 @@ where
/// out of bounds.
pub fn get(&self, pos: usize) -> Option<&T> {
if pos < self.len() {
Some(unsafe { T::__get_unchecked(self, pos) })
Some(unsafe { self.get_unchecked(pos) })
} else {
None
}
@ -61,7 +62,18 @@ where
///
/// [operator_at]: https://en.cppreference.com/w/cpp/container/vector/operator_at
pub unsafe fn get_unchecked(&self, pos: usize) -> &T {
T::__get_unchecked(self, pos)
&*T::__get_unchecked(self, pos)
}
/// Returns a slice to the underlying contiguous array of elements.
pub fn as_slice(&self) -> &[T] {
let len = self.len();
if len == 0 {
<&[T]>::default()
} else {
let ptr = unsafe { T::__get_unchecked(self, 0) };
unsafe { slice::from_raw_parts(ptr, len) }
}
}
}
@ -122,7 +134,7 @@ where
pub unsafe trait VectorElement: Sized {
const __NAME: &'static dyn Display;
fn __vector_size(v: &CxxVector<Self>) -> usize;
unsafe fn __get_unchecked(v: &CxxVector<Self>, pos: usize) -> &Self;
unsafe fn __get_unchecked(v: &CxxVector<Self>, pos: usize) -> *const Self;
fn __unique_ptr_null() -> *mut c_void;
unsafe fn __unique_ptr_raw(raw: *mut CxxVector<Self>) -> *mut c_void;
unsafe fn __unique_ptr_get(repr: *mut c_void) -> *const CxxVector<Self>;
@ -145,14 +157,14 @@ macro_rules! impl_vector_element {
}
unsafe { __vector_size(v) }
}
unsafe fn __get_unchecked(v: &CxxVector<$ty>, pos: usize) -> &$ty {
unsafe fn __get_unchecked(v: &CxxVector<$ty>, pos: usize) -> *const $ty {
extern "C" {
attr! {
#[link_name = concat!("cxxbridge04$std$vector$", $segment, "$get_unchecked")]
fn __get_unchecked(_: &CxxVector<$ty>, _: usize) -> *const $ty;
}
}
&*__get_unchecked(v, pos)
__get_unchecked(v, pos)
}
fn __unique_ptr_null() -> *mut c_void {
extern "C" {