Skip to content

Commit 5522e67

Browse files
authored
Auto merge of #33950 - srinivasreddy:rtstartup_rustfmt, r=Manishearth
run rustfmt on rtstartup folder
2 parents 25f349d + 36964d4 commit 5522e67

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/rtstartup/rsbegin.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
#![allow(non_camel_case_types)]
2828

2929
#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
30-
pub mod eh_frames
31-
{
30+
pub mod eh_frames {
3231
#[no_mangle]
3332
#[link_section = ".eh_frame"]
3433
// Marks beginning of the stack frame unwind info section
@@ -40,7 +39,7 @@ pub mod eh_frames
4039

4140
// Unwind info registration/deregistration routines.
4241
// See the docs of `unwind` module in libstd.
43-
extern {
42+
extern "C" {
4443
fn rust_eh_register_frames(eh_frame_begin: *const u8, object: *mut u8);
4544
fn rust_eh_unregister_frames(eh_frame_begin: *const u8, object: *mut u8);
4645
}
@@ -58,8 +57,7 @@ pub mod eh_frames
5857
}
5958

6059
// MSVC-specific init/uninit routine registration
61-
pub mod ms_init
62-
{
60+
pub mod ms_init {
6361
// .CRT$X?? sections are roughly analogous to ELF's .init_array and .fini_array,
6462
// except that they exploit the fact that linker will sort them alphabitically,
6563
// so e.g. sections with names between .CRT$XIA and .CRT$XIZ are guaranteed to be

src/rtstartup/rsend.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#![no_std]
1515

1616
#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
17-
pub mod eh_frames
18-
{
17+
pub mod eh_frames {
1918
// Terminate the frame unwind info section with a 0 as a sentinel;
2019
// this would be the 'length' field in a real FDE.
2120
#[no_mangle]

0 commit comments

Comments
 (0)