openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2025-02-13 10:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename CxxVector::size to len to match Rust conventions

Browse Source
This commit is contained in:
David Tolnay 2020-04-24 13:30:44 -07:00
parent 31ad0be653
commit c01d0a0f84
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cxx_vector.rs
View File

@ -15,7 +15,7 @@ pub struct CxxVector<T> {
impl<T: VectorElement<T>> CxxVector<T> {
/// Returns the length of the vector in bytes.
pub fn size(&self) -> usize {
pub fn len(&self) -> usize {
T::__vector_length(self)
}
@ -25,11 +25,11 @@ impl<T: VectorElement<T>> CxxVector<T> {
/// Returns true if `self` has a length of zero bytes.
pub fn is_empty(&self) -> bool {
self.size() == 0
self.len() == 0
}
pub fn get(&self, pos: usize) -> Option<&T> {
if pos < self.size() {
if pos < self.len() {
Some(unsafe { T::__get_unchecked(self, pos) })
} else {
None

4
tests/test.rs
View File

@ -32,7 +32,7 @@ fn test_c_return() {
assert_eq!(b"2020\0", ffi::c_return_sliceu8(&shared));
assert_eq!("2020", ffi::c_return_rust_string());
assert_eq!("2020", ffi::c_return_unique_ptr_string().to_str().unwrap());
assert_eq!(4, ffi::c_return_unique_ptr_vector_u8().size());
assert_eq!(4, ffi::c_return_unique_ptr_vector_u8().len());
assert_eq!(
200_u8,
ffi::c_return_unique_ptr_vector_u8().into_iter().sum(),
@ -41,7 +41,7 @@ fn test_c_return() {
200.5_f64,
ffi::c_return_unique_ptr_vector_f64().into_iter().sum(),
);
assert_eq!(2, ffi::c_return_unique_ptr_vector_shared().size());
assert_eq!(2, ffi::c_return_unique_ptr_vector_shared().len());
assert_eq!(
2021_usize,
ffi::c_return_unique_ptr_vector_shared()