Encapsulate RustVec repr to single module
diff --git a/src/rust_vec.rs b/src/rust_vec.rs
index 126fdbf..d449231 100644
--- a/src/rust_vec.rs
+++ b/src/rust_vec.rs
@@ -5,7 +5,7 @@
#[repr(C)]
pub struct RustVec<T> {
- pub(crate) repr: Vec<T>,
+ repr: Vec<T>,
}
impl<T> RustVec<T> {
diff --git a/src/symbols/rust_vec.rs b/src/symbols/rust_vec.rs
index a26a156..4213028 100644
--- a/src/symbols/rust_vec.rs
+++ b/src/symbols/rust_vec.rs
@@ -14,7 +14,7 @@
attr! {
#[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$new")]
unsafe extern "C" fn __new(this: *mut RustVec<$ty>) {
- ptr::write(this, RustVec { repr: Vec::new() });
+ ptr::write(this, RustVec::new());
}
}
attr! {
@@ -26,19 +26,19 @@
attr! {
#[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$len")]
unsafe extern "C" fn __len(this: *const RustVec<$ty>) -> usize {
- (*this).repr.len()
+ (*this).len()
}
}
attr! {
#[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$capacity")]
unsafe extern "C" fn __capacity(this: *const RustVec<$ty>) -> usize {
- (*this).repr.capacity()
+ (*this).capacity()
}
}
attr! {
#[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$data")]
unsafe extern "C" fn __data(this: *const RustVec<$ty>) -> *const $ty {
- (*this).repr.as_ptr()
+ (*this).as_ptr()
}
}
attr! {
@@ -50,7 +50,7 @@
attr! {
#[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$set_len")]
unsafe extern "C" fn __set_len(this: *mut RustVec<$ty>, len: usize) {
- (*this).repr.set_len(len);
+ (*this).set_len(len);
}
}
};