openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2024-11-27 01:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove rust::Str repr conversion on the C++ side

Browse Source
This commit is contained in:
David Tolnay 2021-01-01 22:50:50 -08:00
parent 7f59a693e4
commit 7f65e7cda7
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
3 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gen/src/builtin.rs
View File

@ -20,8 +20,6 @@ pub struct Builtins<'a> {
pub maybe_uninit: bool,
pub trycatch: bool,
pub ptr_len: bool,
pub rust_str_new_unchecked: bool,
pub rust_str_repr: bool,
pub rust_slice_new: bool,
pub rust_slice_repr: bool,
pub exception: bool,
@ -234,33 +232,6 @@ pub(super) fn write(out: &mut OutFile) {
out.end_block(Block::Namespace("repr"));
}
if builtin.rust_str_new_unchecked || builtin.rust_str_repr {
out.next_section();
writeln!(out, "template <>");
writeln!(out, "class impl<Str> final {{");
writeln!(out, "public:");
if builtin.rust_str_new_unchecked {
writeln!(
out,
" static Str new_unchecked(repr::PtrLen repr) noexcept {{",
);
writeln!(out, " Str str;");
writeln!(out, " str.ptr = static_cast<const char *>(repr.ptr);");
writeln!(out, " str.len = repr.len;");
writeln!(out, " return str;");
writeln!(out, " }}");
}
if builtin.rust_str_repr {
writeln!(out, " static repr::PtrLen repr(Str str) noexcept {{");
writeln!(
out,
" return repr::PtrLen{{const_cast<char *>(str.ptr), str.len}};",
);
writeln!(out, " }}");
}
writeln!(out, "}};");
}
if builtin.rust_slice_new || builtin.rust_slice_repr {
out.next_section();
writeln!(out, "template <typename T>");

29
gen/src/write.rs
View File

@ -733,10 +733,6 @@ fn write_cxx_function_shim<'a>(out: &mut OutFile<'a>, efn: &'a ExternFn) {
}
match &efn.ret {
Some(Type::Ref(_)) => write!(out, "&"),
Some(Type::Str(_)) if !indirect_return => {
out.builtin.rust_str_repr = true;
write!(out, "::rust::impl<::rust::Str>::repr(");
}
Some(ty @ Type::SliceRef(_)) if !indirect_return => {
out.builtin.rust_slice_repr = true;
write!(out, "::rust::impl<");
@ -759,13 +755,6 @@ fn write_cxx_function_shim<'a>(out: &mut OutFile<'a>, efn: &'a ExternFn) {
} else if let Type::UniquePtr(_) = &arg.ty {
write_type(out, &arg.ty);
write!(out, "({})", arg.name.cxx);
} else if let Type::Str(_) = arg.ty {
out.builtin.rust_str_new_unchecked = true;
write!(
out,
"::rust::impl<::rust::Str>::new_unchecked({})",
arg.name.cxx,
);
} else if arg.ty == RustString {
out.builtin.unsafe_bitcopy = true;
write!(
@ -796,7 +785,7 @@ fn write_cxx_function_shim<'a>(out: &mut OutFile<'a>, efn: &'a ExternFn) {
match &efn.ret {
Some(Type::RustBox(_)) => write!(out, ".into_raw()"),
Some(Type::UniquePtr(_)) => write!(out, ".release()"),
Some(Type::Str(_)) | Some(Type::SliceRef(_)) if !indirect_return => write!(out, ")"),
Some(Type::SliceRef(_)) if !indirect_return => write!(out, ")"),
_ => {}
}
if indirect_return {
@ -995,10 +984,6 @@ fn write_rust_function_shim_impl(
write!(out, "(");
}
Type::Ref(_) => write!(out, "*"),
Type::Str(_) => {
out.builtin.rust_str_new_unchecked = true;
write!(out, "::rust::impl<::rust::Str>::new_unchecked(");
}
Type::SliceRef(_) => {
out.builtin.rust_slice_new = true;
write!(out, "::rust::impl<");
@ -1023,10 +1008,6 @@ fn write_rust_function_shim_impl(
write!(out, ", ");
}
match &arg.ty {
Type::Str(_) => {
out.builtin.rust_str_repr = true;
write!(out, "::rust::impl<::rust::Str>::repr(");
}
Type::SliceRef(_) => {
out.builtin.rust_slice_repr = true;
write!(out, "::rust::impl<");
@ -1040,7 +1021,7 @@ fn write_rust_function_shim_impl(
match &arg.ty {
Type::RustBox(_) => write!(out, ".into_raw()"),
Type::UniquePtr(_) => write!(out, ".release()"),
Type::Str(_) | Type::SliceRef(_) => write!(out, ")"),
Type::SliceRef(_) => write!(out, ")"),
ty if ty != RustString && out.types.needs_indirect_abi(ty) => write!(out, "$.value"),
_ => {}
}
@ -1062,7 +1043,7 @@ fn write_rust_function_shim_impl(
write!(out, ")");
if !indirect_return {
if let Some(ret) = &sig.ret {
if let Type::RustBox(_) | Type::UniquePtr(_) | Type::Str(_) | Type::SliceRef(_) = ret {
if let Type::RustBox(_) | Type::UniquePtr(_) | Type::SliceRef(_) = ret {
write!(out, ")");
}
}
@ -1133,7 +1114,7 @@ fn write_extern_return_type_space(out: &mut OutFile, ty: &Option<Type>) {
write_type(out, &ty.inner);
write!(out, " *");
}
Some(Type::Str(_)) | Some(Type::SliceRef(_)) => {
Some(Type::SliceRef(_)) => {
out.builtin.ptr_len = true;
write!(out, "::rust::repr::PtrLen ");
}
@ -1148,7 +1129,7 @@ fn write_extern_arg(out: &mut OutFile, arg: &Var) {
write_type_space(out, &ty.inner);
write!(out, "*");
}
Type::Str(_) | Type::SliceRef(_) => {
Type::SliceRef(_) => {
out.builtin.ptr_len = true;
write!(out, "::rust::repr::PtrLen ");
}

4
tests/cxx_gen.rs
View File

@ -20,7 +20,7 @@ fn test_extern_c_function() {
let output = str::from_utf8(&generated.implementation).unwrap();
// To avoid continual breakage we won't test every byte.
// Let's look for the major features.
assert!(output.contains("void cxxbridge1$do_cpp_thing(::rust::repr::PtrLen foo)"));
assert!(output.contains("void cxxbridge1$do_cpp_thing(::rust::Str foo)"));
}
#[test]
@ -30,5 +30,5 @@ fn test_impl_annotation() {
let source = BRIDGE0.parse().unwrap();
let generated = generate_header_and_cc(source, &opt).unwrap();
let output = str::from_utf8(&generated.implementation).unwrap();
assert!(output.contains("ANNOTATION void cxxbridge1$do_cpp_thing(::rust::repr::PtrLen foo)"));
assert!(output.contains("ANNOTATION void cxxbridge1$do_cpp_thing(::rust::Str foo)"));
}