Skip to content

Commit 8e4ed89

Browse files
authored
Rollup merge of #152871 - mati865:fix-rs-begin-end-warnings, r=joboet
Fix warnings in rs{begin,end}.rs files As can be seen locally and in CI logs (dist-i686-mingw) that code used to trigger `static_mut_refs` warning.
2 parents bc309b7 + 6c6f586 commit 8e4ed89

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

library/rtstartup/rsbegin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ pub mod eh_frames {
9090

9191
unsafe extern "C" fn init() {
9292
// register unwind info on module startup
93-
__register_frame_info(&__EH_FRAME_BEGIN__ as *const u8, &mut OBJ as *mut _ as *mut u8);
93+
__register_frame_info(&__EH_FRAME_BEGIN__ as *const u8, &raw mut OBJ as *mut u8);
9494
}
9595

9696
unsafe extern "C" fn uninit() {
9797
// unregister on shutdown
98-
__deregister_frame_info(&__EH_FRAME_BEGIN__ as *const u8, &mut OBJ as *mut _ as *mut u8);
98+
__deregister_frame_info(&__EH_FRAME_BEGIN__ as *const u8, &raw mut OBJ as *mut u8);
9999
}
100100

101101
// MinGW-specific init/uninit routine registration

0 commit comments

Comments
 (0)