openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2024-11-23 15:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant prefix from mangled Box related symbols

Browse Source
This commit is contained in:
David Tolnay 2020-03-01 19:51:46 -08:00
parent da2b904530
commit 9081beb1a0
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gen/write.rs
View File

@ -462,27 +462,27 @@ fn write_rust_box_extern(out: &mut OutFile, ident: &Ident) {
writeln!(out, "#define CXXBRIDGE01_RUST_BOX_{}", instance); writeln!(out, "#define CXXBRIDGE01_RUST_BOX_{}", instance);
writeln!( writeln!(
out, out,
"void cxxbridge01$rust_box${}$uninit(::rust::Box<{}> *ptr) noexcept;", "void cxxbridge01$box${}$uninit(::rust::Box<{}> *ptr) noexcept;",
instance, inner, instance, inner,
); );
writeln!( writeln!(
out, out,
"void cxxbridge01$rust_box${}$set_raw(::rust::Box<{}> *ptr, {} *raw) noexcept;", "void cxxbridge01$box${}$set_raw(::rust::Box<{}> *ptr, {} *raw) noexcept;",
instance, inner, inner instance, inner, inner
); );
writeln!( writeln!(
out, out,
"void cxxbridge01$rust_box${}$drop(::rust::Box<{}> *ptr) noexcept;", "void cxxbridge01$box${}$drop(::rust::Box<{}> *ptr) noexcept;",
instance, inner, instance, inner,
); );
writeln!( writeln!(
out, out,
"const {} *cxxbridge01$rust_box${}$deref(const ::rust::Box<{}> *ptr) noexcept;", "const {} *cxxbridge01$box${}$deref(const ::rust::Box<{}> *ptr) noexcept;",
inner, instance, inner, inner, instance, inner,
); );
writeln!( writeln!(
out, out,
"{} *cxxbridge01$rust_box${}$deref_mut(::rust::Box<{}> *ptr) noexcept;", "{} *cxxbridge01$box${}$deref_mut(::rust::Box<{}> *ptr) noexcept;",
inner, instance, inner, inner, instance, inner,
); );
writeln!(out, "#endif // CXXBRIDGE01_RUST_BOX_{}", instance); writeln!(out, "#endif // CXXBRIDGE01_RUST_BOX_{}", instance);
@ -499,11 +499,7 @@ fn write_rust_box_impl(out: &mut OutFile, ident: &Ident) {
writeln!(out, "template <>"); writeln!(out, "template <>");
writeln!(out, "void Box<{}>::uninit() noexcept {{", inner); writeln!(out, "void Box<{}>::uninit() noexcept {{", inner);
writeln!( writeln!(out, " return cxxbridge01$box${}$uninit(this);", instance);
out,
" return cxxbridge01$rust_box${}$uninit(this);",
instance
);
writeln!(out, "}}"); writeln!(out, "}}");
writeln!(out, "template <>"); writeln!(out, "template <>");
@ -514,18 +510,14 @@ fn write_rust_box_impl(out: &mut OutFile, ident: &Ident) {
); );
writeln!( writeln!(
out, out,
" return cxxbridge01$rust_box${}$set_raw(this, raw);", " return cxxbridge01$box${}$set_raw(this, raw);",
instance instance
); );
writeln!(out, "}}"); writeln!(out, "}}");
writeln!(out, "template <>"); writeln!(out, "template <>");
writeln!(out, "void Box<{}>::drop() noexcept {{", inner); writeln!(out, "void Box<{}>::drop() noexcept {{", inner);
writeln!( writeln!(out, " return cxxbridge01$box${}$drop(this);", instance);
out,
" return cxxbridge01$rust_box${}$drop(this);",
instance
);
writeln!(out, "}}"); writeln!(out, "}}");
writeln!(out, "template <>"); writeln!(out, "template <>");
@ -534,18 +526,14 @@ fn write_rust_box_impl(out: &mut OutFile, ident: &Ident) {
"const {} *Box<{}>::deref() const noexcept {{", "const {} *Box<{}>::deref() const noexcept {{",
inner, inner, inner, inner,
); );
writeln!( writeln!(out, " return cxxbridge01$box${}$deref(this);", instance);
out,
" return cxxbridge01$rust_box${}$deref(this);",
instance
);
writeln!(out, "}}"); writeln!(out, "}}");
writeln!(out, "template <>"); writeln!(out, "template <>");
writeln!(out, "{} *Box<{}>::deref_mut() noexcept {{", inner, inner); writeln!(out, "{} *Box<{}>::deref_mut() noexcept {{", inner, inner);
writeln!( writeln!(
out, out,
" return cxxbridge01$rust_box${}$deref_mut(this);", " return cxxbridge01$box${}$deref_mut(this);",
instance instance
); );
writeln!(out, "}}"); writeln!(out, "}}");

2
macro/src/expand.rs
View File

@ -293,7 +293,7 @@ fn expand_rust_function_shim(namespace: &Namespace, efn: &ExternFn, types: &Type
} }
fn expand_rust_box(namespace: &Namespace, ident: &Ident) -> TokenStream { fn expand_rust_box(namespace: &Namespace, ident: &Ident) -> TokenStream {
let link_prefix = format!("cxxbridge01$rust_box${}{}$", namespace, ident); let link_prefix = format!("cxxbridge01$box${}{}$", namespace, ident);
let link_uninit = format!("{}uninit", link_prefix); let link_uninit = format!("{}uninit", link_prefix);
let link_set_raw = format!("{}set_raw", link_prefix); let link_set_raw = format!("{}set_raw", link_prefix);
let link_drop = format!("{}drop", link_prefix); let link_drop = format!("{}drop", link_prefix);