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

Parse vector's type as CxxVector

Browse Source
This commit is contained in:
David Tolnay 2020-04-24 17:40:55 -07:00
parent 465305bdb4
commit e1dcdf7317
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syntax/parse.rs
View File

@ -300,7 +300,7 @@ fn parse_type_path(ty: &TypePath) -> Result<Type> {
rangle: generic.gt_token,
})));
}
} else if ident == "Vector" && generic.args.len() == 1 {
} else if ident == "CxxVector" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
let inner = parse_type(arg)?;
return Ok(Type::CxxVector(Box::new(Ty1 {

12
tests/ffi/lib.rs
View File

@ -27,9 +27,9 @@ pub mod ffi {
fn c_return_sliceu8(shared: &Shared) -> &[u8];
fn c_return_rust_string() -> String;
fn c_return_unique_ptr_string() -> UniquePtr<CxxString>;
fn c_return_unique_ptr_vector_u8() -> UniquePtr<Vector<u8>>;
fn c_return_unique_ptr_vector_f64() -> UniquePtr<Vector<f64>>;
fn c_return_unique_ptr_vector_shared() -> UniquePtr<Vector<Shared>>;
fn c_return_unique_ptr_vector_u8() -> UniquePtr<CxxVector<u8>>;
fn c_return_unique_ptr_vector_f64() -> UniquePtr<CxxVector<f64>>;
fn c_return_unique_ptr_vector_shared() -> UniquePtr<CxxVector<Shared>>;
fn c_take_primitive(n: usize);
fn c_take_shared(shared: Shared);
@ -41,9 +41,9 @@ pub mod ffi {
fn c_take_sliceu8(s: &[u8]);
fn c_take_rust_string(s: String);
fn c_take_unique_ptr_string(s: UniquePtr<CxxString>);
fn c_take_unique_ptr_vector_u8(s: UniquePtr<Vector<u8>>);
fn c_take_unique_ptr_vector_f64(s: UniquePtr<Vector<f64>>);
fn c_take_unique_ptr_vector_shared(s: UniquePtr<Vector<Shared>>);
fn c_take_unique_ptr_vector_u8(s: UniquePtr<CxxVector<u8>>);
fn c_take_unique_ptr_vector_f64(s: UniquePtr<CxxVector<f64>>);
fn c_take_unique_ptr_vector_shared(s: UniquePtr<CxxVector<Shared>>);
fn c_take_vec_u8(v: &Vec<u8>);
fn c_take_vec_shared(v: &Vec<Shared>);
fn c_take_callback(callback: fn(String) -> usize);