Skip to content

Commit bf6ede6

Browse files
committed
Refer to standard library macros by an absolute path
1 parent 61797c5 commit bf6ede6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

macro/src/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ fn expand_rust_function_shim_impl(
10941094
#[doc(hidden)]
10951095
#[export_name = #link_name]
10961096
unsafe extern "C" fn #local_name #generics(#(#all_args,)* #outparam #pointer) #ret {
1097-
let __fn = concat!(module_path!(), #prevent_unwind_label);
1097+
let __fn = ::cxx::private::concat!(::cxx::private::module_path!(), #prevent_unwind_label);
10981098
#wrap_super
10991099
#expr
11001100
}

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ pub mod private {
508508
pub use crate::unique_ptr::UniquePtrTarget;
509509
pub use crate::unwind::prevent_unwind;
510510
pub use crate::weak_ptr::WeakPtrTarget;
511+
pub use core::{concat, module_path};
511512
pub use cxxbridge_macro::type_id;
512513
}
513514

0 commit comments

Comments
 (0)