Skip to content

Commit 17740a6

Browse files
committed
Use crate name instead of pkg name
1 parent cffa18a commit 17740a6

File tree

1 file changed

+15
-34
lines changed

1 file changed

+15
-34
lines changed

rustler_codegen/src/init.rs

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -136,36 +136,26 @@ impl From<InitMacroInput> for proc_macro2::TokenStream {
136136
}
137137
};
138138

139-
let lib_name = if let Ok(name) = std::env::var("CARGO_PKG_NAME") {
140-
if std::env::var("CARGO_TARGET_OS").unwrap_or_else(|_| "unknown".to_string())
141-
== "windows"
142-
{
143-
name
139+
let nif_init_name = if cfg!(feature = "staticlib") {
140+
let lib_name = if let Ok(name) = std::env::var("CARGO_CRATE_NAME") {
141+
if std::env::var("CARGO_TARGET_OS").unwrap_or_else(|_| "unknown".to_string())
142+
== "windows"
143+
{
144+
name
145+
} else {
146+
format!("lib{name}")
147+
}
144148
} else {
145-
format!("lib{name}")
146-
}
149+
"rustler_pkg".to_string()
150+
};
151+
152+
format!("{lib_name}_nif_init")
147153
} else {
148-
"rustler_pkg".to_string()
154+
"nif_init".to_string()
149155
};
150-
151-
let nif_init_name = format!("{lib_name}_nif_init");
152156
let nif_init_name = Ident::new(&nif_init_name, Span::call_site());
153157

154-
let bare_nif_inits = quote! {
155-
#[cfg(not(windows))]
156-
#[no_mangle]
157-
extern "C" fn nif_init() -> *const ::rustler::codegen_runtime::DEF_NIF_ENTRY {
158-
#nif_init_name()
159-
}
160-
161-
#[cfg(windows)]
162-
#[no_mangle]
163-
extern "C" fn nif_init(callbacks: *mut ::rustler::codegen_runtime::DynNifCallbacks) -> *const ::rustler::codegen_runtime::DEF_NIF_ENTRY {
164-
#nif_init_name(callbacks)
165-
}
166-
};
167-
168-
let nif_inits = quote! {
158+
quote! {
169159
#maybe_warning
170160

171161
#[cfg(not(windows))]
@@ -187,15 +177,6 @@ impl From<InitMacroInput> for proc_macro2::TokenStream {
187177

188178
#inner
189179
}
190-
};
191-
192-
if cfg!(feature = "staticlib") {
193-
nif_inits
194-
} else {
195-
quote! {
196-
#bare_nif_inits
197-
#nif_inits
198-
}
199180
}
200181
}
201182
}

0 commit comments

Comments
 (0)